diff options
| author | Keith Whitwell <keithw@vmware.com> | 2009-12-01 14:31:14 +0000 |
|---|---|---|
| committer | Keith Whitwell <keithw@vmware.com> | 2009-12-01 14:31:14 +0000 |
| commit | 87eec80c1120d2cd9749ee360b77922feabf7f10 (patch) | |
| tree | e60d852329b2d8b981dcc1928a6f8d1a2254e120 /src/gallium/state_trackers/python/samples | |
| parent | 06d3732a9094030fc33120f16f162e0d405f132c (diff) | |
| parent | 5285de7c0fc067dc036a5b421140a696ce2cabbf (diff) | |
Merge commit 'origin/tgsi-simplify-ext'
Conflicts:
src/gallium/drivers/r300/r300_vs.c
Diffstat (limited to 'src/gallium/state_trackers/python/samples')
| -rw-r--r-- | src/gallium/state_trackers/python/samples/tri.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/state_trackers/python/samples/tri.py b/src/gallium/state_trackers/python/samples/tri.py index b721e0b575..87acf60366 100644 --- a/src/gallium/state_trackers/python/samples/tri.py +++ b/src/gallium/state_trackers/python/samples/tri.py @@ -159,7 +159,7 @@ def test(dev): # vertex shader vs = Shader(''' - VERT1.1 + VERT DCL IN[0], POSITION, CONSTANT DCL IN[1], COLOR, CONSTANT DCL OUT[0], POSITION, CONSTANT @@ -172,7 +172,7 @@ def test(dev): # fragment shader fs = Shader(''' - FRAG1.1 + FRAG DCL IN[0], COLOR, LINEAR DCL OUT[0], COLOR, CONSTANT 0:MOV OUT[0], IN[0] |