qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-04-03 16:01:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

[qfcc] Ensure geometry shader invocations is set

Browse source 
It must always be at least 1, but specifying it in glsl is optional.

And now geometry shaders work :)
This commit is contained in:
Bill Currie 2025-02-05 10:25:50 +09:00
parent e1969a9ded
commit 8ca018f062
3 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
tools/qfcc/include/glsl-lang.h
View file

@ -47,6 +47,7 @@ void glsl_init_vert (rua_ctx_t *ctx);
void glsl_init_tesc (rua_ctx_t *ctx);
void glsl_init_tese (rua_ctx_t *ctx);
void glsl_init_geom (rua_ctx_t *ctx);
int glsl_finish_geom (const char *file, rua_ctx_t *ctx);
void glsl_init_frag (rua_ctx_t *ctx);
int glsl_parse_string (const char *str, rua_ctx_t *ctx);

1
tools/qfcc/source/glsl-parse.y
View file

@ -2002,6 +2002,7 @@ language_t lang_glsl_geom = {
.default_float = true,
.init = glsl_init_geom,
.parse = glsl_yyparse,
.finish = glsl_finish_geom,
.extension = glsl_extension,
.version = glsl_version,
.on_include = glsl_on_include,

16
tools/qfcc/source/glsl-sub_geom.c
View file

@ -36,7 +36,9 @@
#include "tools/qfcc/include/def.h"
#include "tools/qfcc/include/diagnostic.h"
#include "tools/qfcc/include/glsl-lang.h"
#include "tools/qfcc/include/qfcc.h"
#include "tools/qfcc/include/shared.h"
#include "tools/qfcc/include/spirv.h"
#include "tools/qfcc/include/strpool.h"
#include "tools/qfcc/include/symtab.h"
#include "tools/qfcc/include/type.h"
@ -54,3 +56,17 @@ glsl_sublang_t glsl_geom_sublanguage = {
.interface_default_names = glsl_geom_interface_default_names,
.model_name = "Geometry",
};
int
glsl_finish_geom (const char *file, rua_ctx_t *ctx)
{
if (!pr.module || !pr.module->entry_points) {
return 1;
}
auto invocations = pr.module->entry_points->invocations;
if (!invocations) {
invocations = new_int_expr (1, false);
pr.module->entry_points->invocations = invocations;
}
return 1;
}