Skip to content

Commit

Permalink
GLSL fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
jjxtra committed Jun 13, 2013
1 parent 53886db commit 4907ea7
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions framework/Source/GPUImageSolidColorGenerator.m
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@
varying highp vec2 textureCoordinate;
uniform sampler2D inputImageTexture;
uniform vec4 color;
uniform int useExistingAlpha;
uniform float useExistingAlpha;

void main()
{
lowp vec4 textureColor = texture2D(inputImageTexture, textureCoordinate);
gl_FragColor = vec4(color.rgb, max(textureColor.a, 1.0 - useExistingAlpha));
}
);
Expand All @@ -21,10 +22,11 @@ void main()
varying vec2 textureCoordinate;
uniform sampler2D inputImageTexture;
uniform vec4 color;
uniform int useExistingAlpha;
uniform float useExistingAlpha;

void main()
{
vec4 textureColor = texture2D(inputImageTexture, textureCoordinate);
gl_FragColor = vec4(color.rgb, max(textureColor.a, 1.0 - useExistingAlpha));
}
);
Expand Down

0 comments on commit 4907ea7

Please sign in to comment.