MapleShrine
/
mkxp
1
0
Fork 0
Code Issues 32 Pull Requests 11 Projects Releases Wiki Activity

Fix shader code. Thanks Mesa! 

On the other hand, the kind of shit fglrx
just lets through boggles the mind.
This commit is contained in:
Jonas Kulla 2013-10-02 15:00:17 +02:00
parent bb70c39811
commit 19c30e3ddd
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
shader/bitmapBlit.frag
View File

@ -21,10 +21,10 @@ void main()
vec4 resFrag; vec4 resFrag;
float ab = opacity; float ab = opacity;
const float as = srcFrag.a; float as = srcFrag.a;
const float ad = dstFrag.a; float ad = dstFrag.a;
const float at = ab*as; float at = ab*as;
resFrag.a = at + ad - ad*at; resFrag.a = at + ad - ad*at;
resFrag.rgb = mix(dstFrag.rgb, srcFrag.rgb, ab*as); resFrag.rgb = mix(dstFrag.rgb, srcFrag.rgb, ab*as);

4
shader/blurH.vert
View File

@ -14,6 +14,6 @@ void main()
gl_Position = projMat * vec4(position, 0, 1); gl_Position = projMat * vec4(position, 0, 1);
v_texCoord = texCoord * texSizeInv; v_texCoord = texCoord * texSizeInv;
v_blurCoord[0] = vec2(texCoord.x-1, texCoord.y) * texSizeInv; v_blurCoord[0] = vec2(texCoord.x-1.0, texCoord.y) * texSizeInv;
v_blurCoord[1] = vec2(texCoord.x+1, texCoord.y) * texSizeInv; v_blurCoord[1] = vec2(texCoord.x+1.0, texCoord.y) * texSizeInv;
} }

4
shader/blurV.vert
View File

@ -14,6 +14,6 @@ void main()
gl_Position = projMat * vec4(position, 0, 1); gl_Position = projMat * vec4(position, 0, 1);
v_texCoord = texCoord * texSizeInv; v_texCoord = texCoord * texSizeInv;
v_blurCoord[0] = vec2(texCoord.x, texCoord.y-1) * texSizeInv; v_blurCoord[0] = vec2(texCoord.x, texCoord.y-1.0) * texSizeInv;
v_blurCoord[1] = vec2(texCoord.x, texCoord.y+1) * texSizeInv; v_blurCoord[1] = vec2(texCoord.x, texCoord.y+1.0) * texSizeInv;
} }

4
shader/plane.frag
View File

@ -9,7 +9,7 @@ uniform vec4 flash;
varying vec2 v_texCoord; varying vec2 v_texCoord;
const vec3 lumaF = { .299, .587, .114 }; const vec3 lumaF = vec3(.299, .587, .114);
void main() void main()
{ {
@ -17,7 +17,7 @@ void main()
vec4 frag = texture2D(texture, v_texCoord); vec4 frag = texture2D(texture, v_texCoord);
/* Apply gray */ /* Apply gray */
const float luma = dot(frag.rgb, lumaF); float luma = dot(frag.rgb, lumaF);
frag.rgb = mix(frag.rgb, vec3(luma), tone.w); frag.rgb = mix(frag.rgb, vec3(luma), tone.w);
/* Apply tone */ /* Apply tone */

4
shader/sprite.frag
View File

@ -11,7 +11,7 @@ uniform float bushOpacity;
varying vec2 v_texCoord; varying vec2 v_texCoord;
const vec3 lumaF = { .299, .587, .114 }; const vec3 lumaF = vec3(.299, .587, .114);
void main() void main()
{ {
@ -19,7 +19,7 @@ void main()
vec4 frag = texture2D(texture, v_texCoord); vec4 frag = texture2D(texture, v_texCoord);
/* Apply gray */ /* Apply gray */
const float luma = dot(frag.rgb, lumaF); float luma = dot(frag.rgb, lumaF);
frag.rgb = mix(frag.rgb, vec3(luma), tone.w); frag.rgb = mix(frag.rgb, vec3(luma), tone.w);
/* Apply tone */ /* Apply tone */