webCLgl backend: fixed dynamic attributes, js-mode needs glsljit code outside of wrapper function so that this can be bound properly.

hartsantler · hartsantler · commit 534054b30081 · 2014-06-22T02:14:16.000-07:00
diff --git a/pythonjs/pythonjs.py b/pythonjs/pythonjs.py
@@ -317,8 +317,8 @@ def _visit_function(self, node):
 			lines.append(';')
 
 			if is_main:
-				insert = lines
-				lines = []
+				#insert = lines
+				#lines = []
 
 				if not glsl_wrapper_name:
 					glsl_wrapper_name = node.name
@@ -328,9 +328,9 @@ def _visit_function(self, node):
 				else:
 					lines.append('function %s( __offset ) {' %glsl_wrapper_name )
 
-				lines.append('	__offset =  __offset || 0')  ## note by default: 0 allows 0-1.0 ## TODO this needs to be set per-buffer
+				lines.append('	__offset =  __offset || 1024*512')  ## note by default: 0 allows 0-1.0 ## TODO this needs to be set per-buffer
 
-				lines.extend( insert )
+				#lines.extend( insert )
 
 				lines.append('  var __webclgl = new WebCLGL()')
 				lines.append('	var header = "\\n".join(__shader_header__)')
diff --git a/regtests/webclgl/dynamic_attributes.py b/regtests/webclgl/dynamic_attributes.py
@@ -0,0 +1,28 @@
+class myclass:
+	def __init__(self):
+		self.width = 100
+		self.height = 64
+		self.step = 0.01
+
+	def run(self, w, h, s):
+		self.width = w
+		self.height = h
+		self.step = s
+
+		@returns( array=[8,8] )
+		@gpu.main
+		def gpufunc():
+			float b = 0.0
+			for x in range( self.width ):
+				for y in range( self.height ):
+					b += self.step
+			return b
+
+		return gpufunc()
+
+def main():
+	A = myclass()
+	r = A.run(4,4, 0.8)
+	print(r)
+	r = A.run(16,16, 0.5)
+	print(r)
