From c823b2bf3165990a556d50990adf4da5cee95593 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Fri, 2 Nov 2012 15:36:19 +0000 Subject: commit Gem 0.93.3 from http://gem.iem.at/releases/0.93.3/Gem-0.93.3-W32-i686.zip svn path=/trunk/; revision=16521 --- .../extra/Gem/examples/10.glsl/multitexture.frag | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'packages/noncvs/windows/extra/Gem/examples/10.glsl/multitexture.frag') diff --git a/packages/noncvs/windows/extra/Gem/examples/10.glsl/multitexture.frag b/packages/noncvs/windows/extra/Gem/examples/10.glsl/multitexture.frag index 9e8ed0ce..1118bedc 100644 --- a/packages/noncvs/windows/extra/Gem/examples/10.glsl/multitexture.frag +++ b/packages/noncvs/windows/extra/Gem/examples/10.glsl/multitexture.frag @@ -1,13 +1,13 @@ -uniform sampler2D MyTex; -uniform sampler2D MyTex1; - -varying vec2 texcoord1; -varying vec2 texcoord2; - -void main (void) -{ - vec4 color = texture2D(MyTex, texcoord1); - vec4 color2 = texture2D(MyTex1, texcoord2); - gl_FragColor = (color + color2) / 2.; -} - +uniform sampler2D MyTex; +uniform sampler2D MyTex1; + +varying vec2 texcoord1; +varying vec2 texcoord2; + +void main (void) +{ + vec4 color = texture2D(MyTex, texcoord1); + vec4 color2 = texture2D(MyTex1, texcoord2); + gl_FragColor = (color + color2) / 2.; +} + -- cgit v1.2.1