Merge commit 'origin/master' into gallium-0.2

[mesa.git] / src / gallium / state_trackers / python / samples / tri.py

diff --git a/src/gallium/state_trackers/python/samples/tri.py b/src/gallium/state_trackers/python/samples/tri.py
index 366592292980946ebbf1b80276f42d7965a66f87..193479f7d6cc31d08416e20cbedb35452de84a9b 100644 (file)
--- a/src/gallium/state_trackers/python/samples/tri.py
+++ b/src/gallium/state_trackers/python/samples/tri.py
@@ -140,9 +140,11 @@ def test(dev):
     ctx.set_clip(clip)
 
     # framebuffer
-    cbuf = dev.texture_create(PIPE_FORMAT_X8R8G8B8_UNORM, 
-                              width, height,
-                              usage=PIPE_TEXTURE_USAGE_DISPLAY_TARGET)
+    cbuf = dev.texture_create(
+        PIPE_FORMAT_X8R8G8B8_UNORM, 
+        width, height,
+        tex_usage=PIPE_TEXTURE_USAGE_DISPLAY_TARGET,
+    )
     _cbuf = cbuf.get_surface(usage = PIPE_BUFFER_USAGE_GPU_READ|PIPE_BUFFER_USAGE_GPU_WRITE)
     fb = Framebuffer()
     fb.width = width
@@ -165,7 +167,6 @@ def test(dev):
         1:MOV OUT[1], IN[1]
         2:END
     ''')
-    #vs.dump()
     ctx.set_vertex_shader(vs)
 
     # fragment shader
@@ -176,7 +177,6 @@ def test(dev):
         0:MOV OUT[0], IN[0]
         1:END
     ''')
-    #fs.dump()
     ctx.set_fragment_shader(fs)
 
     nverts = 3
@@ -216,6 +216,7 @@ def test(dev):
     ctx.flush()
     
     show_image(cbuf.get_surface(usage = PIPE_BUFFER_USAGE_CPU_READ|PIPE_BUFFER_USAGE_CPU_WRITE))
+    #save_image('tri.png', cbuf.get_surface(usage = PIPE_BUFFER_USAGE_CPU_READ|PIPE_BUFFER_USAGE_CPU_WRITE))