Merge commit '5667bc0af221bfb2540cd64cd2b50d375e369fdc' into eugene-js-to-webclgl

PicoCreator · PicoCreator · commit dc1dd783b6f4 · 2016-01-23T16:26:48.000+08:00
diff --git a/demo/index.html b/demo/index.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <title>Test Case A</title>
+</head>
+<body>
+<script src="../src/gpu.js"></script>
+<script>
+var threadDim = [3];
+var blockDim = [1];
+
+var f = GPU.makeKernel(function(ctx, a, b) {
+    var ret = a[ctx.thread.x] + b[ctx.thread.x];
+    return ret;
+}, threadDim, blockDim);
+
+
+var a = [1, 2, 3];
+var b = [4, 5, 6];
+
+var c = f(a, b);
+// c = [5, 7, 9];
+console.dir(c);
+</script>
+</body>
+</html>
diff --git a/demo/jison-demo.html b/demo/jison-demo.html
@@ -1 +1,15 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <title>Basic JISON conversion test</title>
+</head>
+<body>
+<script src="../lib/require.js"></script>
+<script src="../lib/jison.js"></script>
+<script src="../src/js-to-webclgl.js"></script>
+<script>
 
+</script>
+</body>
+</html>
diff --git a/demo/test.js b/demo/test.js
@@ -0,0 +1,14 @@
+var threadDim = [3];
+var blockDim = [1];
+
+var f = GPU.makeKernel(function(ctx, a, b) {
+    var ret = a[ctx.thread.x] + b[ctx.thread.x];
+    return ret;
+}, threadDim, blockDim);
+
+
+var a = [1, 2, 3];
+var b = [4, 5, 6];
+
+var c = f(a, b);
+// c = [5, 7, 9];
diff --git a/src/gpu.js b/src/gpu.js
@@ -0,0 +1,9 @@
+GPU = {};
+
+GPU.makeKernel = function(kernel, threadDim, blockDim) {
+    
+    
+    return function() {
+        
+    }
+};
