AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'origin/tgsi-simplify-ext'

Browse Source 
Conflicts:
	src/gallium/drivers/r300/r300_vs.c
This commit is contained in:
Keith Whitwell
2009-12-01 14:31:14 +00:00
parent 06d3732a90 5285de7c0f
commit 87eec80c11
104 changed files with 1718 additions and 2500 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/state_trackers/python/samples/tri.py
+2 -2
View File
@@ -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]
src/gallium/state_trackers/python/tests/regress/fragment-shader/frag-abs.sh
+1 -1
View File
@@ -1,4 +1,4 @@
FRAG1.1
FRAG
DCL IN[0], COLOR, LINEAR
DCL OUT[0], COLOR
src/gallium/state_trackers/python/tests/regress/fragment-shader/frag-add.sh
+1 -1
View File
@@ -1,4 +1,4 @@
FRAG1.1
FRAG
DCL IN[0], COLOR, LINEAR
DCL OUT[0], COLOR
src/gallium/state_trackers/python/tests/regress/fragment-shader/frag-dp3.sh
+1 -1
View File
@@ -1,4 +1,4 @@
FRAG1.1
FRAG
DCL IN[0], COLOR, LINEAR
DCL OUT[0], COLOR
src/gallium/state_trackers/python/tests/regress/fragment-shader/frag-dp4.sh
+1 -1
View File
@@ -1,4 +1,4 @@
FRAG1.1
FRAG
DCL IN[0], COLOR, LINEAR
DCL OUT[0], COLOR
src/gallium/state_trackers/python/tests/regress/fragment-shader/frag-dst.sh
+1 -1
View File
@@ -1,4 +1,4 @@
FRAG1.1
FRAG
DCL IN[0], COLOR, LINEAR
DCL OUT[0], COLOR
src/gallium/state_trackers/python/tests/regress/fragment-shader/frag-ex2.sh
+1 -1
View File
@@ -1,4 +1,4 @@
FRAG1.1
FRAG
DCL IN[0], COLOR, LINEAR
DCL OUT[0], COLOR
src/gallium/state_trackers/python/tests/regress/fragment-shader/frag-flr.sh
+1 -1
View File
@@ -1,4 +1,4 @@
FRAG1.1
FRAG
DCL IN[0], COLOR, LINEAR
DCL OUT[0], COLOR
src/gallium/state_trackers/python/tests/regress/fragment-shader/frag-frc.sh
+1 -1
View File
@@ -1,4 +1,4 @@
FRAG1.1
FRAG
DCL IN[0], COLOR, LINEAR
DCL OUT[0], COLOR
src/gallium/state_trackers/python/tests/regress/fragment-shader/frag-lg2.sh
+1 -1
View File
@@ -1,4 +1,4 @@
FRAG1.1
FRAG
DCL IN[0], COLOR, LINEAR
DCL OUT[0], COLOR
src/gallium/state_trackers/python/tests/regress/fragment-shader/frag-lit.sh
+1 -1
View File
@@ -1,4 +1,4 @@
FRAG1.1
FRAG
DCL IN[0], COLOR, LINEAR
DCL OUT[0], COLOR
src/gallium/state_trackers/python/tests/regress/fragment-shader/frag-lrp.sh
+1 -1
View File
@@ -1,4 +1,4 @@
FRAG1.1
FRAG
DCL IN[0], COLOR, LINEAR
DCL OUT[0], COLOR
src/gallium/state_trackers/python/tests/regress/fragment-shader/frag-mad.sh
+1 -1
View File
@@ -1,4 +1,4 @@
FRAG1.1
FRAG
DCL IN[0], COLOR, LINEAR
DCL OUT[0], COLOR
src/gallium/state_trackers/python/tests/regress/fragment-shader/frag-max.sh
+1 -1
View File
@@ -1,4 +1,4 @@
FRAG1.1
FRAG
DCL IN[0], COLOR, LINEAR
DCL OUT[0], COLOR
src/gallium/state_trackers/python/tests/regress/fragment-shader/frag-min.sh
+1 -1
View File
@@ -1,4 +1,4 @@
FRAG1.1
FRAG
DCL IN[0], COLOR, LINEAR
DCL OUT[0], COLOR
src/gallium/state_trackers/python/tests/regress/fragment-shader/frag-mov.sh
+1 -1
View File
@@ -1,4 +1,4 @@
FRAG1.1
FRAG
DCL IN[0], COLOR, LINEAR
DCL OUT[0], COLOR
src/gallium/state_trackers/python/tests/regress/fragment-shader/frag-mul.sh
+1 -1
View File
@@ -1,4 +1,4 @@
FRAG1.1
FRAG
DCL IN[0], COLOR, LINEAR
DCL OUT[0], COLOR
src/gallium/state_trackers/python/tests/regress/fragment-shader/frag-rcp.sh
+1 -1
View File
@@ -1,4 +1,4 @@
FRAG1.1
FRAG
DCL IN[0], COLOR, LINEAR
DCL OUT[0], COLOR
src/gallium/state_trackers/python/tests/regress/fragment-shader/frag-rsq.sh
+1 -1
View File
@@ -1,4 +1,4 @@
FRAG1.1
FRAG
DCL IN[0], COLOR, LINEAR
DCL OUT[0], COLOR
src/gallium/state_trackers/python/tests/regress/fragment-shader/frag-sge.sh
+1 -1
View File
@@ -1,4 +1,4 @@
FRAG1.1
FRAG
DCL IN[0], COLOR, LINEAR
DCL OUT[0], COLOR
src/gallium/state_trackers/python/tests/regress/fragment-shader/frag-srcmod-abs.sh
+1 -1
View File
@@ -1,4 +1,4 @@
FRAG1.1
FRAG
DCL IN[0], COLOR, LINEAR
DCL OUT[0], COLOR
src/gallium/state_trackers/python/tests/regress/fragment-shader/frag-srcmod-absneg.sh
+1 -1
View File
@@ -1,4 +1,4 @@
FRAG1.1
FRAG
DCL IN[0], COLOR, LINEAR
DCL OUT[0], COLOR
src/gallium/state_trackers/python/tests/regress/fragment-shader/frag-srcmod-neg.sh
+1 -1
View File
@@ -1,4 +1,4 @@
FRAG1.1
FRAG
DCL IN[0], COLOR, LINEAR
DCL OUT[0], COLOR
src/gallium/state_trackers/python/tests/regress/fragment-shader/frag-srcmod-swz.sh
+1 -1
View File
@@ -1,4 +1,4 @@
FRAG1.1
FRAG
DCL IN[0], COLOR, LINEAR
DCL OUT[0], COLOR
src/gallium/state_trackers/python/tests/regress/fragment-shader/frag-sub.sh
+1 -1
View File
@@ -1,4 +1,4 @@
FRAG1.1
FRAG
DCL IN[0], COLOR, LINEAR
DCL OUT[0], COLOR
src/gallium/state_trackers/python/tests/regress/fragment-shader/frag-xpd.sh
+1 -1
View File
@@ -1,4 +1,4 @@
FRAG1.1
FRAG
DCL IN[0], COLOR, LINEAR
DCL OUT[0], COLOR
src/gallium/state_trackers/python/tests/regress/fragment-shader/fragment-shader.py
+1 -1
View File
@@ -131,7 +131,7 @@ def test(dev, name):
# vertex shader
vs = Shader('''
VERT1.1
VERT
DCL IN[0], POSITION
DCL IN[1], COLOR
DCL OUT[0], POSITION
src/gallium/state_trackers/python/tests/regress/vertex-shader/vert-abs.sh
+1 -1
View File
@@ -1,4 +1,4 @@
VERT1.1
VERT
DCL IN[0], POSITION
DCL IN[1], COLOR
src/gallium/state_trackers/python/tests/regress/vertex-shader/vert-add.sh
+1 -1
View File
@@ -1,4 +1,4 @@
VERT1.1
VERT
DCL IN[0], POSITION
DCL IN[1], COLOR
src/gallium/state_trackers/python/tests/regress/vertex-shader/vert-arl.sh
+1 -1
View File
@@ -1,4 +1,4 @@
VERT1.1
VERT
DCL IN[0], POSITION
DCL OUT[0], POSITION
src/gallium/state_trackers/python/tests/regress/vertex-shader/vert-arr.sh
+1 -1
View File
@@ -1,4 +1,4 @@
VERT1.1
VERT
DCL IN[0], POSITION
DCL OUT[0], POSITION
src/gallium/state_trackers/python/tests/regress/vertex-shader/vert-dp3.sh
+1 -1
View File
@@ -1,4 +1,4 @@
VERT1.1
VERT
DCL IN[0], POSITION
DCL IN[1], COLOR
src/gallium/state_trackers/python/tests/regress/vertex-shader/vert-dp4.sh
+1 -1
View File
@@ -1,4 +1,4 @@
VERT1.1
VERT
DCL IN[0], POSITION
DCL IN[1], COLOR
src/gallium/state_trackers/python/tests/regress/vertex-shader/vert-dst.sh
+1 -1
View File
@@ -1,4 +1,4 @@
VERT1.1
VERT
DCL IN[0], POSITION
DCL IN[1], COLOR
src/gallium/state_trackers/python/tests/regress/vertex-shader/vert-ex2.sh
+1 -1
View File
@@ -1,4 +1,4 @@
VERT1.1
VERT
DCL IN[0], POSITION
DCL IN[1], COLOR
src/gallium/state_trackers/python/tests/regress/vertex-shader/vert-flr.sh
+1 -1
View File
@@ -1,4 +1,4 @@
VERT1.1
VERT
DCL IN[0], POSITION
DCL OUT[0], POSITION
src/gallium/state_trackers/python/tests/regress/vertex-shader/vert-frc.sh
+1 -1
View File
@@ -1,4 +1,4 @@
VERT1.1
VERT
DCL IN[0], POSITION
DCL OUT[0], POSITION
src/gallium/state_trackers/python/tests/regress/vertex-shader/vert-lg2.sh
+1 -1
View File
@@ -1,4 +1,4 @@
VERT1.1
VERT
DCL IN[0], POSITION
DCL IN[1], COLOR
src/gallium/state_trackers/python/tests/regress/vertex-shader/vert-lit.sh
+1 -1
View File
@@ -1,4 +1,4 @@
VERT1.1
VERT
DCL IN[0], POSITION
DCL IN[1], COLOR
src/gallium/state_trackers/python/tests/regress/vertex-shader/vert-lrp.sh
+1 -1
View File
@@ -1,4 +1,4 @@
VERT1.1
VERT
DCL IN[0], POSITION
DCL IN[1], COLOR
src/gallium/state_trackers/python/tests/regress/vertex-shader/vert-mad.sh
+1 -1
View File
@@ -1,4 +1,4 @@
VERT1.1
VERT
DCL IN[0], POSITION
DCL IN[1], COLOR
src/gallium/state_trackers/python/tests/regress/vertex-shader/vert-max.sh
+1 -1
View File
@@ -1,4 +1,4 @@
VERT1.1
VERT
DCL IN[0], POSITION
DCL IN[1], COLOR
src/gallium/state_trackers/python/tests/regress/vertex-shader/vert-min.sh
+1 -1
View File
@@ -1,4 +1,4 @@
VERT1.1
VERT
DCL IN[0], POSITION
DCL IN[1], COLOR
src/gallium/state_trackers/python/tests/regress/vertex-shader/vert-mov.sh
+1 -1
View File
@@ -1,4 +1,4 @@
VERT1.1
VERT
DCL IN[0], POSITION
DCL IN[1], COLOR
src/gallium/state_trackers/python/tests/regress/vertex-shader/vert-mul.sh
+1 -1
View File
@@ -1,4 +1,4 @@
VERT1.1
VERT
DCL IN[0], POSITION
DCL IN[1], COLOR
src/gallium/state_trackers/python/tests/regress/vertex-shader/vert-rcp.sh
+1 -1
View File
@@ -1,4 +1,4 @@
VERT1.1
VERT
DCL IN[0], POSITION
DCL IN[1], COLOR
src/gallium/state_trackers/python/tests/regress/vertex-shader/vert-rsq.sh
+1 -1
View File
@@ -1,4 +1,4 @@
VERT1.1
VERT
DCL IN[0], POSITION
DCL IN[1], COLOR
src/gallium/state_trackers/python/tests/regress/vertex-shader/vert-sge.sh
+1 -1
View File
@@ -1,4 +1,4 @@
VERT1.1
VERT
DCL IN[0], POSITION
DCL IN[1], COLOR
src/gallium/state_trackers/python/tests/regress/vertex-shader/vert-slt.sh
+1 -1
View File
@@ -1,4 +1,4 @@
VERT1.1
VERT
DCL IN[0], POSITION
DCL IN[1], COLOR
src/gallium/state_trackers/python/tests/regress/vertex-shader/vert-srcmod-abs.sh
+1 -1
View File
@@ -1,4 +1,4 @@
VERT1.1
VERT
DCL IN[0], POSITION
DCL IN[1], COLOR
src/gallium/state_trackers/python/tests/regress/vertex-shader/vert-srcmod-absneg.sh
+1 -1
View File
@@ -1,4 +1,4 @@
VERT1.1
VERT
DCL IN[0], POSITION
DCL IN[1], COLOR
src/gallium/state_trackers/python/tests/regress/vertex-shader/vert-srcmod-neg.sh
+1 -1
View File
@@ -1,4 +1,4 @@
VERT1.1
VERT
DCL IN[0], POSITION
DCL IN[1], COLOR
src/gallium/state_trackers/python/tests/regress/vertex-shader/vert-srcmod-swz.sh
+1 -1
View File
@@ -1,4 +1,4 @@
VERT1.1
VERT
DCL IN[0], POSITION
DCL IN[1], COLOR
src/gallium/state_trackers/python/tests/regress/vertex-shader/vert-sub.sh
+1 -1
View File
@@ -1,4 +1,4 @@
VERT1.1
VERT
DCL IN[0], POSITION
DCL IN[1], COLOR
src/gallium/state_trackers/python/tests/regress/vertex-shader/vert-xpd.sh
+1 -1
View File
@@ -1,4 +1,4 @@
VERT1.1
VERT
DCL IN[0], POSITION
DCL IN[1], COLOR
src/gallium/state_trackers/python/tests/regress/vertex-shader/vertex-shader.py
+1 -1
View File
@@ -135,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]
src/gallium/state_trackers/python/tests/texture_render.py
+2 -2
View File
@@ -171,7 +171,7 @@ class TextureTest(TestCase):
# vertex shader
vs = Shader('''
VERT1.1
VERT
DCL IN[0], POSITION, CONSTANT
DCL IN[1], GENERIC, CONSTANT
DCL OUT[0], POSITION, CONSTANT
@@ -185,7 +185,7 @@ class TextureTest(TestCase):
# fragment shader
fs = Shader('''
FRAG1.1
FRAG
DCL IN[0], GENERIC[0], LINEAR
DCL OUT[0], COLOR, CONSTANT
DCL SAMP[0], CONSTANT
src/gallium/state_trackers/python/tests/texture_sample.py
+4 -4
View File
@@ -216,7 +216,7 @@ class TextureColorSampleTest(TestCase):
# vertex shader
vs = Shader('''
VERT1.1
VERT
DCL IN[0], POSITION, CONSTANT
DCL IN[1], GENERIC, CONSTANT
DCL OUT[0], POSITION, CONSTANT
@@ -236,7 +236,7 @@ class TextureColorSampleTest(TestCase):
PIPE_TEXTURE_CUBE: "CUBE",
}[target]
fs = Shader('''
FRAG1.1
FRAG
DCL IN[0], GENERIC[0], LINEAR
DCL OUT[0], COLOR, CONSTANT
DCL SAMP[0], CONSTANT
@@ -415,7 +415,7 @@ class TextureDepthSampleTest(TestCase):
# vertex shader
vs = Shader('''
VERT1.1
VERT
DCL IN[0], POSITION, CONSTANT
DCL IN[1], GENERIC, CONSTANT
DCL OUT[0], POSITION, CONSTANT
@@ -435,7 +435,7 @@ class TextureDepthSampleTest(TestCase):
PIPE_TEXTURE_CUBE: "CUBE",
}[target]
fs = Shader('''
FRAG1.1
FRAG
DCL IN[0], GENERIC[0], LINEAR
DCL SAMP[0], CONSTANT
DCL OUT[0].z, POSITION