projects / mesa.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge branch 'mesa_7_7_branch'
[mesa.git] / src / gallium / state_trackers / python / tests / regress / vertex-shader / vertex-shader.py
diff --git a/src/gallium/state_trackers/python/tests/regress/vertex-shader/vertex-shader.py b/src/gallium/state_trackers/python/tests/regress/vertex-shader/vertex-shader.py
index 7e0b561d79a6fc73890b8f889565d034186e9b62..01bf5a3210d0f9bcade5a71d193d4947333fea41 100644 (file)
--- a/src/gallium/state_trackers/python/tests/regress/vertex-shader/vertex-shader.py
+++ b/src/gallium/state_trackers/python/tests/regress/vertex-shader/vertex-shader.py
@@ -59,7 +59,7 @@ def test(dev, name):
 
     # depth/stencil/alpha
     depth_stencil_alpha = DepthStencilAlpha()
-    depth_stencil_alpha.depth.enabled = 1
+    depth_stencil_alpha.depth.enabled = 0
     depth_stencil_alpha.depth.writemask = 1
     depth_stencil_alpha.depth.func = PIPE_FUNC_LESS
     ctx.set_depth_stencil_alpha(depth_stencil_alpha)
@@ -96,7 +96,7 @@ def test(dev, name):
     sampler.min_img_filter = PIPE_TEX_MIPFILTER_NEAREST
     sampler.mag_img_filter = PIPE_TEX_MIPFILTER_NEAREST
     sampler.normalized_coords = 1
-    ctx.set_sampler(0, sampler)
+    ctx.set_fragment_sampler(0, sampler)
 
     # scissor
     scissor = Scissor()
@@ -112,24 +112,22 @@ def test(dev, name):
 
     # framebuffer
     cbuf = dev.texture_create(
-        PIPE_FORMAT_X8R8G8B8_UNORM, 
+        PIPE_FORMAT_X8R8G8B8_UNORM,
         width, height,
-        tex_usage=PIPE_TEXTURE_USAGE_DISPLAY_TARGET,
-    ).get_surface()
-    zbuf = dev.texture_create(
-        PIPE_FORMAT_Z32_UNORM, 
-        width, height,
-        tex_usage=PIPE_TEXTURE_USAGE_DEPTH_STENCIL,
+        tex_usage=PIPE_TEXTURE_USAGE_RENDER_TARGET,
     ).get_surface()
     fb = Framebuffer()
     fb.width = width
     fb.height = height
     fb.nr_cbufs = 1
     fb.set_cbuf(0, cbuf)
-    fb.set_zsbuf(zbuf)
     ctx.set_framebuffer(fb)
-    ctx.surface_clear(cbuf, 0x80808080)
-    ctx.surface_clear(zbuf, 0xffffffff)
+    rgba = FloatArray(4);
+    rgba[0] = 0.5
+    rgba[1] = 0.5
+    rgba[2] = 0.5
+    rgba[3] = 0.5
+    ctx.clear(PIPE_CLEAR_COLOR, rgba, 0.0, 0)
 
     # vertex shader
     vs = Shader(file('vert-' + name + '.sh', 'rt').read())
@@ -137,7 +135,7 @@ def test(dev, name):
 
     # fragment shader
     fs = Shader('''
-        FRAG1.1
+        FRAG
         DCL IN[0], COLOR, LINEAR
         DCL OUT[0], COLOR, CONSTANT
         0:MOV OUT[0], IN[0]
@@ -213,31 +211,37 @@ def main():
     tests = [
         'abs',
         'add',
+        'arl',
+        'arr',
         'dp3',
         'dp4',
+        'dst',
+        'ex2',
+        'flr',
+        'frc',
+        'lg2',
+        'lit',
+        'lrp',
+        'mad',
+        'max',
+        'min',
         'mov',
         'mul',
+        'rcp',
+        'rsq',
+        'sge',
+        'slt',
+        'srcmod-abs',
+        'srcmod-absneg',
+        'srcmod-neg',
+        'srcmod-swz',
         'sub',
+        'xpd',
     ]
-    
-    html = '''<html>
-<head>
-<link rel=\"stylesheet\" type=\"text/css\" media=\"screen\" href=\"screen.css\">
-</head>
-<body>
-<div class=\"main\">
-<h2>regression tests for <span style=\"color: #FF8000\">vertex</span> shader</h2>
-<table><tbody>
-'''
 
     dev = Device()
     for t in tests:
         test(dev, t)
-        html += '<tr><td width=\"300px\">' + t + '</td>'
-        html += '<td><img src=\"vert-' + t + '.png\"></img></td></tr>\n'
-
-    html += '</tbody></table>\n</body>\n</html>\n'
-    file('vertex-shader.htm', 'wt').write(html)
 
 if __name__ == '__main__':
     main()