feat(glsl): support for glsl 3.0 in and out

Author: MrTelanie

src/glsl/builtin.js

@@ -248,10 +248,22 @@ export class BuiltIn {
     return undefined;
   }
 
+  output() {
+    return undefined;
+  }
+
   uniform() {
     return readOnlyView(BLOCKED);
   }
 
+  attribute() {
+    return readOnlyView(BLOCKED);
+  }
+
+  input() {
+    return readOnlyView(BLOCKED);
+  }
+
   int(...args) {
     return checkType(args, Number) ?? args[0];
   }

src/glsl/index.js

@@ -10,7 +10,9 @@ const ORIGINALS = Symbol('Originals');
 const qualifiers = [
   'varying',
   'uniform',
-  'attribute'
+  'attribute',
+  'input',
+  'output'
 ];
 
 const TREE_SETTINGS = {
@@ -167,11 +169,21 @@ function retSta({ argument }) {
   return `return ${handleNode(argument)}`;
 }
 
+function prepareQualifier(qualifier) {
+  if (qualifier === 'input') {
+    return 'in';
+  }
+  if (qualifier === 'output') {
+    return 'out';
+  }
+  return qualifier;
+}
+
 function ident(node) {
   let { name, typeAnnotation, qualifier } = node;
   let q = '';
   if (qualifier) {
-    q = `${qualifier} `;
+    q = `${prepareQualifier(qualifier)} `;
   }
   let t = '';
   if (typeAnnotation) {
@@ -305,7 +317,7 @@ function handleAssign(node, kind) {
 
   let qualifier = '';
   if (q) {
-    qualifier = `${q} `;
+    qualifier = `${prepareQualifier(q)} `;
   } else if (kind === 'const') {
     qualifier = 'const ';
   }
@@ -370,6 +382,25 @@ function handleBody(body, tabCount = 0) {
     .join('\n');
 }
 
+// function replaceGenType(node) {
+//   console.log('replaceGenType', node);
+//   return node;
+// }
+//
+// function handleGenTypes(body) {
+//   return body.map((node) => {
+//     if (node.right && node.right.init && node.right.init.returnType === 'genType') {
+//       return [
+//         replaceGenType(JSON.parse(JSON.stringify(node)), 'float'),
+//         replaceGenType(JSON.parse(JSON.stringify(node)), 'vec2'),
+//         replaceGenType(JSON.parse(JSON.stringify(node)), 'vec3'),
+//         replaceGenType(JSON.parse(JSON.stringify(node)), 'vec4')
+//       ];
+//     }
+//     return [node];
+//   }).flat(1);
+// }
+
 export function buildGLSL(fun, { glsl = true, js = undefined, ast = undefined } = {}) {
   // console.log('fun', fun.toString());
 
@@ -387,7 +418,7 @@ export function buildGLSL(fun, { glsl = true, js = undefined, ast = undefined }
       const { body } = node.body[0].expression;
 
       body.body = body.body.filter(({ type }) => (type !== 'ReturnStatement'));
-
+      // body.body = handleGenTypes(body.body);
       let sh = handleBody(body);
 
       sh = sh.split('\n').map((s) => {

test/glsl/index.js

@@ -270,7 +270,7 @@ vec2 bar(vec2 x, float y) {
   });
 
   it('const handling works.', () => {
-    const { glsl, ast } = buildGLSL(() => {
+    const { glsl } = buildGLSL(() => {
       const foo = uniform(vec2(0.0));
       const bar = vec2(0.0);
       let baz = vec2(0.0);
@@ -297,4 +297,45 @@ void fnFVoid() {
   `;
     assert.equal(glsl.trim(), expected.trim());
   });
+
+  it('interpret gentype works.', () => {
+    const { glsl, ast } = buildGLSL(() => {
+      const foo = gentype((x = gentype()) => {
+        let res = gentype(x * 5.0);
+        return res;
+      });
+    });
+
+    const expected = `
+gentype foo(gentype x) {
+\tgentype res = x * 5.0;
+\treturn res;
+}
+  `;
+    assert.equal(glsl.trim(), expected.trim());
+  });
+
+  it('works glsl 3.0 in and out.', () => {
+    const { glsl } = buildGLSL(() => {
+      let foo = input(vec2);
+
+      let bar = output(vec2);
+
+      let baz = (x = vec2(), y = float()) => {
+        x = normalize(x);
+        bar = x;
+      };
+    });
+
+    const expected = `
+in vec2 foo;
+out vec2 bar;
+void baz(vec2 x, float y) {
+\tx = normalize(x);
+\tbar = x;
+}
+  `;
+
+    assert.equal(glsl.trim(), expected.trim());
+  });
 });