Uses uniform instead of attribute in PassThrough.vs

yvt · Aug 22, 2013 · fbf864d · fbf864d
1 parent 79ab1ad
commit fbf864d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/Resources/Shaders/PostFilters/PassThrough.vs b/Resources/Shaders/PostFilters/PassThrough.vs
@@ -1,7 +1,7 @@
 
 
 attribute vec2 positionAttribute;
-attribute vec4 colorAttribute;
+uniform vec4 colorUniform;
 
 uniform vec4 texCoordRange;
 
@@ -16,7 +16,7 @@ void main() {
 
 	gl_Position = vec4(scrPos, 0.5, 1.);
 
-	color = colorAttribute;
+	color = colorUniform;
 	texCoord = pos * texCoordRange.zw + texCoordRange.xy;
 }
 
diff --git a/Sources/Draw/GLBloomFilter.cpp b/Sources/Draw/GLBloomFilter.cpp
@@ -43,7 +43,7 @@ namespace spades {
 
 			GLProgram *thru = renderer->RegisterProgram("Shaders/PostFilters/PassThrough.program");
 			static GLProgramAttribute thruPosition("positionAttribute");
-			static GLProgramAttribute thruColor("colorAttribute");
+			static GLProgramUniform thruColor("colorUniform");
 			static GLProgramUniform thruTexture("texture");
 			static GLProgramUniform thruTexCoordRange("texCoordRange");
 
@@ -66,7 +66,7 @@ namespace spades {
 			gammaMixMix2(gammaMix);
 
 			thru->Use();
-			dev->VertexAttrib(thruColor(), 1, 1, 1, 1);
+			thruColor.SetValue(1.f, 1.f, 1.f, 1.f);
 			thruTexture.SetValue(0);
 			dev->Enable(IGLDevice::Blend, false);
 
@@ -120,7 +120,7 @@ namespace spades {
 				dev->BindTexture(IGLDevice::Texture2D, curLevel.GetTexture());
 				dev->BindFramebuffer(IGLDevice::Framebuffer, targLevel.GetFramebuffer());
 				dev->Viewport(0, 0, targLevel.GetWidth(), targLevel.GetHeight());
-				dev->VertexAttrib(thruColor(), 1, 1, 1, alpha);
+				thruColor.SetValue(1.f, 1.f, 1.f, alpha);
 				qr.Draw();
 				dev->BindTexture(IGLDevice::Texture2D, 0);
 			}

diff --git a/Sources/Draw/GLSoftSpriteRenderer.cpp b/Sources/Draw/GLSoftSpriteRenderer.cpp
@@ -298,20 +298,20 @@ namespace spades {
 				// composite
 				program = renderer->RegisterProgram("Shaders/PostFilters/PassThrough.program");
 				static GLProgramAttribute positionAttribute("positionAttribute");
-				static GLProgramAttribute colorAttribute("colorAttribute");
+				static GLProgramUniform colorUniform("colorUniform");
 				static GLProgramUniform textureUniform("texture");
 				static GLProgramUniform texCoordRange("texCoordRange");
 
 				positionAttribute(program);
 				textureUniform(program);
 				texCoordRange(program);
-				colorAttribute(program);
+				colorUniform(program);
 
 				program->Use();
 
 				textureUniform.SetValue(0);
 				texCoordRange.SetValue(0.f, 0.f, 1.f, 1.f);
-				device->VertexAttrib(colorAttribute(), 1.f, 1.f, 1.f, 1.f);
+				colorUniform.SetValue(1.f, 1.f, 1.f, 1.f);
 
 				qr.SetCoordAttributeIndex(positionAttribute());
 				device->BindFramebuffer(IGLDevice::Framebuffer, lastFb);