alice.mosphere.at / sdl-gpu
this repo has no description
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge pull request #118 from NuklearBomb/patch-1

GLSL fixes

authored by

Jonathan Dearborn and committed by
GitHub 6e843d8d 72c3fe78

+8 -8
+4 -4
demos/data/shaders/alpha_mask.frag
··· 1 1 2 - in vec4 color; 3 - in vec2 texCoord; 4 - out vec4 fragColor; 2 + varying vec4 color; 3 + varying vec2 texCoord; 4 + #define fragColor gl_FragColor 5 5 6 6 uniform sampler2D tex; 7 7 uniform sampler2D mask_tex; ··· 19 19 vec2 mask_coords = vec2((texCoord.x*resolution_x + offset_x)/mask_resolution_x, (texCoord.y*resolution_y + offset_y)/mask_resolution_y); 20 20 vec4 mask = texture2D(mask_tex, mask_coords); 21 21 fragColor = vec4(col.rgb, col.a*mask.a); 22 - } 22 + }
+4 -4
demos/data/shaders/marching_ants.frag
··· 1 1 2 - in vec4 color; 3 - in vec2 texCoord; 4 - out vec4 fragColor; 2 + varying vec4 color; 3 + varying vec2 texCoord; 4 + #define fragColor gl_FragColor 5 5 6 6 uniform sampler2D tex; 7 7 ··· 48 48 } 49 49 else 50 50 discard; 51 - } 51 + }