webCLgl backend: fixed return array of vec4

hartsantler · hartsantler · commit bdb473c819c1 · 2014-06-19T16:45:43.000-07:00
diff --git a/pythonjs/python_to_pythonjs.py b/pythonjs/python_to_pythonjs.py
@@ -156,7 +156,7 @@ def __init__(self, source=None, module=None, module_path=None, dart=False, coffe
 
 		self._with_glsl = False
 		self._in_gpu_main = False
-		self._gpu_return_type = 'array'  ## 'array' or float32 or array of 'vec4' float32's.
+		self._gpu_return_types = set() ## 'array' or float32, or array of 'vec4' float32's.
 
 		self._source = source.splitlines()
 		self._classes = dict()    ## class name : [method names]
@@ -1137,13 +1137,10 @@ def visit_Return(self, node):
 
 			if self._with_glsl and self._in_gpu_main:
 				## _id_ is inserted into all function headers by pythonjs.py for glsl functions.
-				if self._gpu_return_type == 'array':
+				if 'array' in self._gpu_return_types:
 					writer.write('out_float = %s' %self.visit(node.value))
-				elif self._gpu_return_type == 'vec4':
+				if 'vec4' in self._gpu_return_types:
 					writer.write('out_float4 = %s' %self.visit(node.value))
-				else:
-					raise NotImplementedError(node)
-
 
 			elif self._inline:
 				writer.write('__returns__%s = %s' %(self._inline[-1], self.visit(node.value)) )
@@ -2407,6 +2404,7 @@ def visit_FunctionDef(self, node):
 		threaded = self._with_webworker
 		jsfile = None
 
+		self._gpu_return_types = set()
 		gpu = False
 		gpu_main = False
 		gpu_vectorize = False
@@ -2449,6 +2447,7 @@ def visit_FunctionDef(self, node):
 					for k in decorator.keywords:
 						key = k.arg
 						assert key == 'array' or key == 'vec4'
+						self._gpu_return_types.add(key)  ## used in visit_Return ##
 						return_type_keywords[ key ] = self.visit(k.value)
 
 				else:
