rename: fetch_ --> fetch; fetchArrays_ --> fetchArrays

author: Péter Diviánszky <divipp@gmail.com> 2016-02-22 15:15:23 +0100
committer: Péter Diviánszky <divipp@gmail.com> 2016-02-22 15:15:44 +0100
commit: 23b42e612a6a7864428674b3c9d63ed86fc07435 (patch)
tree: 79bea78eba5d508ef9d4072c9721a4c09f87a000 /testdata/later.ignore
parent: 94dead004d04bd80db17429859454981513be814 (diff)
7 files changed, 7 insertions, 7 deletions
diff --git a/testdata/later.ignore/DemoUtils.lc b/testdata/later.ignore/DemoUtils.lc
index 21f7f182..0f60fdd4 100644
--- a/testdata/later.ignore/DemoUtils.lc
+++ b/testdata/later.ignore/DemoUtils.lc
@@ -16,7 +16,7 @@ colorFragmentCtx = accumulationContext (DepthOp Less True, ColorOp NoBlending (V
 rasterizeWith = Rasterize
 triangles = triangleRasterCtx
-cubeVertexStream = fetch "stream4" Triangle (Attribute "position4" :: ((Vec 4 Float)))
+cubeVertexStream = fetch "stream4" (Attribute "position4" :: ((Vec 4 Float)))
 mapFragments s fs bg = accumulate colorFragmentCtx PassAll (FragmentShaderRastDepth $ \((a)) -> ((fs a))) s bg
 transform s f =  Transform (\v -> VertexOut (f v) 1.0 () (Smooth v)) s
diff --git a/testdata/later.ignore/ShadowMapping.lc b/testdata/later.ignore/ShadowMapping.lc
index 70a3cb9b..679f395f 100644
--- a/testdata/later.ignore/ShadowMapping.lc
+++ b/testdata/later.ignore/ShadowMapping.lc
@@ -48,7 +48,7 @@ blur coefficients img = filter1D dirH (PrjImage (filter1D dirV img))
            uv'    = uv *! 0.5 +! 0.5
            pos    = V4 uv%x uv%y 1.0 1.0
-        prims = Transform vert (fetch "postSlot" Triangle (Attribute "position" :: Vec 2 Float))
+        prims = Transform vert (fetch "postSlot" (Attribute "position" :: Vec 2 Float))
        frag :: FragmentShader (Vec 2 Float -> Color (Vec 4 Float))
        frag = FragmentShader $ \uv -> sample
diff --git a/testdata/later.ignore/fragment02tuple.lc b/testdata/later.ignore/fragment02tuple.lc
index cdd363aa..3c7f1eb2 100644
--- a/testdata/later.ignore/fragment02tuple.lc
+++ b/testdata/later.ignore/fragment02tuple.lc
@@ -6,7 +6,7 @@ colorFragmentCtx = accumulationContext ((ColorOp NoBlending (V4 True True True T
 rasterizeWith = Rasterize
 triangles = triangleRasterCtx
-quadVertexStream = fetch "quad" Triangle (Attribute "position" :: ((Vec 4 Float)))
+quadVertexStream = fetch "quad" (Attribute "position" :: ((Vec 4 Float)))
 transform s f =  Transform (\v -> VertexOut v 1 () (f v)) s
diff --git a/testdata/later.ignore/fragment02vectorpattern.lc b/testdata/later.ignore/fragment02vectorpattern.lc
index bb25c660..f60011ae 100644
--- a/testdata/later.ignore/fragment02vectorpattern.lc
+++ b/testdata/later.ignore/fragment02vectorpattern.lc
@@ -6,7 +6,7 @@ colorFragmentCtx = accumulationContext ((ColorOp NoBlending (V4 True True True T
 rasterizeWith = Rasterize
 triangles = triangleRasterCtx
-quadVertexStream = fetch "quad" Triangle (Attribute "position" :: ((Vec 4 Float)))
+quadVertexStream = fetch "quad" (Attribute "position" :: ((Vec 4 Float)))
 transform s f =  Transform (\v -> VertexOut (f v) 1 () (Smooth v)) s
diff --git a/testdata/later.ignore/fragment05uniform.lc b/testdata/later.ignore/fragment05uniform.lc
index cb77f9b1..2025fa12 100644
--- a/testdata/later.ignore/fragment05uniform.lc
+++ b/testdata/later.ignore/fragment05uniform.lc
@@ -7,7 +7,7 @@ colorFragmentCtx = accumulationContext ((ColorOp NoBlending (V4 True True True T
 rasterizeWith = Rasterize
 triangles = triangleRasterCtx
-quadVertexStream = fetch "quad" Triangle (Attribute "position" :: ((Vec 4 Float)))
+quadVertexStream = fetch "quad" (Attribute "position" :: ((Vec 4 Float)))
 transform s f =  Transform (\v -> VertexOut (f v) 1 () (Smooth v)) s
diff --git a/testdata/later.ignore/fragment06tailrecursion.lc b/testdata/later.ignore/fragment06tailrecursion.lc
index 838857bf..d621a6fe 100644
--- a/testdata/later.ignore/fragment06tailrecursion.lc
+++ b/testdata/later.ignore/fragment06tailrecursion.lc
@@ -7,7 +7,7 @@ colorFragmentCtx = accumulationContext ((ColorOp NoBlending (V4 True True True T
 rasterizeWith = Rasterize
 triangles = triangleRasterCtx
-quadVertexStream = fetch "quad" Triangle (Attribute "position" :: ((Vec 4 Float)))
+quadVertexStream = fetch "quad" (Attribute "position" :: ((Vec 4 Float)))
 transform s f =  Transform (\v -> VertexOut (f v) 1 () (Smooth v)) s
diff --git a/testdata/later.ignore/record01.lc b/testdata/later.ignore/record01.lc
index 7ba02512..f493da58 100644
--- a/testdata/later.ignore/record01.lc
+++ b/testdata/later.ignore/record01.lc
@@ -15,7 +15,7 @@ main = let
  fragmentCtx       = (DepthOp Less True, ColorOp blend (V4 True True True True))
  modelViewProj     = Uniform "MVP" :: Mat 4 4 Float
  vertexShader ((v))    = (PrimMulMatVec modelViewProj v, v)
-  vertexStream      = fetch "stream4" Triangle (Attribute "position4" :: ((Vec 4 Float)))
+  vertexStream      = fetch "stream4" (Attribute "position4" :: ((Vec 4 Float)))
  primitiveStream   = mapPrimitives vertexShader vertexStream
  fragmentStream    = rasterizePrimitives rasterCtx ((Smooth)) primitiveStream
  fragmentShader'   = \((v)) -> (V4 1.0 0.4 0.0 0.2)
author	Péter Diviánszky <divipp@gmail.com>	2016-02-22 15:15:23 +0100
committer	Péter Diviánszky <divipp@gmail.com>	2016-02-22 15:15:44 +0100
commit	23b42e612a6a7864428674b3c9d63ed86fc07435 (patch)
tree	79bea78eba5d508ef9d4072c9721a4c09f87a000 /testdata/later.ignore
parent	94dead004d04bd80db17429859454981513be814 (diff)

diff --git a/testdata/later.ignore/DemoUtils.lc b/testdata/later.ignore/DemoUtils.lc index 21f7f182..0f60fdd4 100644 --- a/testdata/later.ignore/DemoUtils.lc +++ b/testdata/later.ignore/DemoUtils.lc
@@ -16,7 +16,7 @@ colorFragmentCtx = accumulationContext (DepthOp Less True, ColorOp NoBlending (V
16	rasterizeWith = Rasterize	16	rasterizeWith = Rasterize
17	triangles = triangleRasterCtx	17	triangles = triangleRasterCtx
18		18
19	cubeVertexStream = fetch "stream4" Triangle (Attribute "position4" :: ((Vec 4 Float)))	19	cubeVertexStream = fetch "stream4" (Attribute "position4" :: ((Vec 4 Float)))
20	mapFragments s fs bg = accumulate colorFragmentCtx PassAll (FragmentShaderRastDepth $ \((a)) -> ((fs a))) s bg	20	mapFragments s fs bg = accumulate colorFragmentCtx PassAll (FragmentShaderRastDepth $ \((a)) -> ((fs a))) s bg
21	transform s f = Transform (\v -> VertexOut (f v) 1.0 () (Smooth v)) s	21	transform s f = Transform (\v -> VertexOut (f v) 1.0 () (Smooth v)) s
22		22


diff --git a/testdata/later.ignore/ShadowMapping.lc b/testdata/later.ignore/ShadowMapping.lc index 70a3cb9b..679f395f 100644 --- a/testdata/later.ignore/ShadowMapping.lc +++ b/testdata/later.ignore/ShadowMapping.lc
@@ -48,7 +48,7 @@ blur coefficients img = filter1D dirH (PrjImage (filter1D dirV img))
48	uv' = uv *! 0.5 +! 0.5	48	uv' = uv *! 0.5 +! 0.5
49	pos = V4 uv%x uv%y 1.0 1.0	49	pos = V4 uv%x uv%y 1.0 1.0
50		50
51	prims = Transform vert (fetch "postSlot" Triangle (Attribute "position" :: Vec 2 Float))	51	prims = Transform vert (fetch "postSlot" (Attribute "position" :: Vec 2 Float))
52		52
53	frag :: FragmentShader (Vec 2 Float -> Color (Vec 4 Float))	53	frag :: FragmentShader (Vec 2 Float -> Color (Vec 4 Float))
54	frag = FragmentShader $ \uv -> sample	54	frag = FragmentShader $ \uv -> sample


diff --git a/testdata/later.ignore/fragment02tuple.lc b/testdata/later.ignore/fragment02tuple.lc index cdd363aa..3c7f1eb2 100644 --- a/testdata/later.ignore/fragment02tuple.lc +++ b/testdata/later.ignore/fragment02tuple.lc
@@ -6,7 +6,7 @@ colorFragmentCtx = accumulationContext ((ColorOp NoBlending (V4 True True True T
6	rasterizeWith = Rasterize	6	rasterizeWith = Rasterize
7	triangles = triangleRasterCtx	7	triangles = triangleRasterCtx
8		8
9	quadVertexStream = fetch "quad" Triangle (Attribute "position" :: ((Vec 4 Float)))	9	quadVertexStream = fetch "quad" (Attribute "position" :: ((Vec 4 Float)))
10		10
11	transform s f = Transform (\v -> VertexOut v 1 () (f v)) s	11	transform s f = Transform (\v -> VertexOut v 1 () (f v)) s
12		12


diff --git a/testdata/later.ignore/fragment02vectorpattern.lc b/testdata/later.ignore/fragment02vectorpattern.lc index bb25c660..f60011ae 100644 --- a/testdata/later.ignore/fragment02vectorpattern.lc +++ b/testdata/later.ignore/fragment02vectorpattern.lc
@@ -6,7 +6,7 @@ colorFragmentCtx = accumulationContext ((ColorOp NoBlending (V4 True True True T
6	rasterizeWith = Rasterize	6	rasterizeWith = Rasterize
7	triangles = triangleRasterCtx	7	triangles = triangleRasterCtx
8		8
9	quadVertexStream = fetch "quad" Triangle (Attribute "position" :: ((Vec 4 Float)))	9	quadVertexStream = fetch "quad" (Attribute "position" :: ((Vec 4 Float)))
10		10
11	transform s f = Transform (\v -> VertexOut (f v) 1 () (Smooth v)) s	11	transform s f = Transform (\v -> VertexOut (f v) 1 () (Smooth v)) s
12		12


diff --git a/testdata/later.ignore/fragment05uniform.lc b/testdata/later.ignore/fragment05uniform.lc index cb77f9b1..2025fa12 100644 --- a/testdata/later.ignore/fragment05uniform.lc +++ b/testdata/later.ignore/fragment05uniform.lc
@@ -7,7 +7,7 @@ colorFragmentCtx = accumulationContext ((ColorOp NoBlending (V4 True True True T
7	rasterizeWith = Rasterize	7	rasterizeWith = Rasterize
8	triangles = triangleRasterCtx	8	triangles = triangleRasterCtx
9		9
10	quadVertexStream = fetch "quad" Triangle (Attribute "position" :: ((Vec 4 Float)))	10	quadVertexStream = fetch "quad" (Attribute "position" :: ((Vec 4 Float)))
11		11
12	transform s f = Transform (\v -> VertexOut (f v) 1 () (Smooth v)) s	12	transform s f = Transform (\v -> VertexOut (f v) 1 () (Smooth v)) s
13		13


diff --git a/testdata/later.ignore/fragment06tailrecursion.lc b/testdata/later.ignore/fragment06tailrecursion.lc index 838857bf..d621a6fe 100644 --- a/testdata/later.ignore/fragment06tailrecursion.lc +++ b/testdata/later.ignore/fragment06tailrecursion.lc
@@ -7,7 +7,7 @@ colorFragmentCtx = accumulationContext ((ColorOp NoBlending (V4 True True True T
7	rasterizeWith = Rasterize	7	rasterizeWith = Rasterize
8	triangles = triangleRasterCtx	8	triangles = triangleRasterCtx
9		9
10	quadVertexStream = fetch "quad" Triangle (Attribute "position" :: ((Vec 4 Float)))	10	quadVertexStream = fetch "quad" (Attribute "position" :: ((Vec 4 Float)))
11		11
12	transform s f = Transform (\v -> VertexOut (f v) 1 () (Smooth v)) s	12	transform s f = Transform (\v -> VertexOut (f v) 1 () (Smooth v)) s
13		13


diff --git a/testdata/later.ignore/record01.lc b/testdata/later.ignore/record01.lc index 7ba02512..f493da58 100644 --- a/testdata/later.ignore/record01.lc +++ b/testdata/later.ignore/record01.lc
@@ -15,7 +15,7 @@ main = let
15	fragmentCtx = (DepthOp Less True, ColorOp blend (V4 True True True True))	15	fragmentCtx = (DepthOp Less True, ColorOp blend (V4 True True True True))
16	modelViewProj = Uniform "MVP" :: Mat 4 4 Float	16	modelViewProj = Uniform "MVP" :: Mat 4 4 Float
17	vertexShader ((v)) = (PrimMulMatVec modelViewProj v, v)	17	vertexShader ((v)) = (PrimMulMatVec modelViewProj v, v)
18	vertexStream = fetch "stream4" Triangle (Attribute "position4" :: ((Vec 4 Float)))	18	vertexStream = fetch "stream4" (Attribute "position4" :: ((Vec 4 Float)))
19	primitiveStream = mapPrimitives vertexShader vertexStream	19	primitiveStream = mapPrimitives vertexShader vertexStream
20	fragmentStream = rasterizePrimitives rasterCtx ((Smooth)) primitiveStream	20	fragmentStream = rasterizePrimitives rasterCtx ((Smooth)) primitiveStream
21	fragmentShader' = \((v)) -> (V4 1.0 0.4 0.0 0.2)	21	fragmentShader' = \((v)) -> (V4 1.0 0.4 0.0 0.2)