git.ucc.asn.au
/
ipdf
/
code.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Crash instead of generating NaN. This breaks everything.
[ipdf/code.git]
/
src
/
shaders
/
basictex_frag.glsl
diff --git
a/src/shaders/basictex_frag.glsl
b/src/shaders/basictex_frag.glsl
index
534ff02
..
b7dfe19
100644
(file)
--- a/
src/shaders/basictex_frag.glsl
+++ b/
src/shaders/basictex_frag.glsl
@@
-9,7
+9,6
@@
uniform vec4 colour;
void main()
{
- output_colour = colour;
- output_colour.a = texture(tex, fp_tex_coord).r;
+ output_colour = texture(tex, fp_tex_coord) * colour;
}
UCC
git Repository :: git.ucc.asn.au