webCLgl backend: fixed pure python typedef vars that use an attribute a.x

hartsantler · hartsantler · commit 70da183996a4 · 2014-06-20T22:44:59.000-07:00
diff --git a/pythonjs/python_to_pythonjs.py b/pythonjs/python_to_pythonjs.py
@@ -2418,6 +2418,7 @@ def visit_FunctionDef(self, node):
 		threaded = self._with_webworker
 		jsfile = None
 
+		self._typedef_vars = dict()  ## clear typed variables: filled in below by @typedef or in visit_Assign
 		self._gpu_return_types = set()
 		gpu = False
 		gpu_main = False
@@ -2441,6 +2442,7 @@ def visit_FunctionDef(self, node):
 				assert len(c.args) == 0 and len(c.keywords)
 				for kw in c.keywords:
 					assert isinstance( kw.value, Name)
+					self._typedef_vars[ kw.arg ] = kw.value.id
 					self._instances[ kw.arg ] = kw.value.id
 					self._func_typedefs[ kw.arg ] = kw.value.id
 					local_typedefs.append( '%s=%s' %(kw.arg, kw.value.id))
diff --git a/regtests/webclgl/hello_gpu.py b/regtests/webclgl/hello_gpu.py
@@ -1,18 +1,19 @@
 """gpu test"""
 
 def main():
-	with glsl as myfunc:
-		def main(buffA, buffB, num):
-			float* buffA
-			float* buffB
-			float num
-			vec2 n = get_global_id()  ## WebCL API
-			float result = 0.0
-			for i in range(1000):
-				result = sqrt(result + A[n] + B[n] + float(i))
-			return result * num
+	@returns( array=[4,16])
+	@gpu.main
+	def myfunc(a, b, num):
+		float* a
+		float* b
+		float num
+		vec2 n = get_global_id()  ## WebCL API
+		float result = 0.0
+		for i in range(1000):
+			result = sqrt(result + a[n] + b[n] + float(i))
+		return result * num
 
-	A = [1,2,3]
-	B = [4,5,6]
-	res = myfunc( A, B, 2.0 )
+	A = [ 0.5 for x in range(64) ]
+	B = [ 0.25 for x in range(64) ]
+	res = myfunc( A, B, 0.1 )
 	print(res)
diff --git a/regtests/webclgl/mandel_purepy.py b/regtests/webclgl/mandel_purepy.py
@@ -10,7 +10,7 @@ def pprint(arr, w):
 
 def main():
 
-	@returns( array=[32,32] )
+	@returns( array=[64,64] )
 	@typedef( x=float, y=float, tempX=float, i=int, runaway=int, c=vec2)
 	@gpu.main
 	def gpufunc():
@@ -30,7 +30,10 @@ def gpufunc():
 		return float(runaway) * 0.01
 
 	res = gpufunc()
+	print(res)
+	TestError( len(res)==64*64 )
+
 	#pprint(res, 32)
-	for row in res:
-		a = [ round(v,3) for v in row ]
-		print( a )
+	#for row in res:
+	#	a = [ round(v,3) for v in row ]
+	#	print( a )
