diff --git a/tools/qfcc/source/glsl-builtins.c b/tools/qfcc/source/glsl-builtins.c index 94d5783dd..d8177543d 100644 --- a/tools/qfcc/source/glsl-builtins.c +++ b/tools/qfcc/source/glsl-builtins.c @@ -998,18 +998,22 @@ SRC_LINE "#define _subpassInput(x,m) __spI(,m),__spI(i,m),__spI(u,m)" "\n" "#define gvec4 @vector(gsubpassInput.sample_type, 4)" "\n" "#define gvec4MS @vector(gsubpassInputMS.sample_type, 4)" "\n" +"#define IMAGE_PARAMS gsubpassInput image, gsubpassInput.coord_type P" "\n" +"#define IMAGE_PARAMS_MS gsubpassInputMS image, gsubpassInputMS.coord_type P, int sample" "\n" "@generic(gsubpassInput=[_subpassInput(,)]," "\n" " gsubpassInputMS=[_subpassInput(,MS)]) {" "\n" +"gvec4 __imageLoad(readonly IMAGE_PARAMS) = " SPV(OpImageRead) ";" "\n" +"gvec4MS __imageLoad(readonly IMAGE_PARAMS_MS) = " SPV(OpImageRead) ";" "\n" "gvec4 subpassLoad(gsubpassInput subpass)" "\n" "{" "\n" -" return imageLoad(subpass," "\n" -" @construct(gsubpassInput.coord_type, 0));" "\n" +" return __imageLoad(subpass," "\n" +" @construct(gsubpassInput.coord_type, 0));" "\n" "}" "\n" "gvec4MS subpassLoad(gsubpassInputMS subpass, int sample)" "\n" "{" "\n" -" return imageLoad(subpass," "\n" -" @construct(gsubpassInputMS.coord_type, 0)," "\n" -" sample);" "\n" +" return __imageLoad(subpass," "\n" +" @construct(gsubpassInputMS.coord_type, 0)," "\n" +" sample);" "\n" "}" "\n" "};" "\n" "#undef uint" "\n"