jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libobs: Don't use 'output' as a keyword in shader 

The bilinear lowres scale effect was using 'output' for a variable,
which is apparently a reserved keyword in GLSL on macs.  This slipped
by me due to the fact that this didn't occur with OpenGL on my windows
machine.
master
jp9000 2015-04-10 09:58:04 -07:00
parent ea8327ce5b
commit 6e572d849f
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libobs/data/bilinear_lowres_scale.effect
View File

@ -37,18 +37,18 @@ float4 pixel(float2 uv)
float4 DrawLowresBilinear(VertData v_in)
{
float2 stepxy = base_dimension_i;
float4 output;
float4 out_color;
output = pixel(v_in.uv);
output += pixel(v_in.uv + float2(-stepxy.x, -stepxy.y));
output += pixel(v_in.uv + float2(-stepxy.x, 0.0));
output += pixel(v_in.uv + float2(-stepxy.x, stepxy.y));
output += pixel(v_in.uv + float2( 0.0, -stepxy.y));
output += pixel(v_in.uv + float2( 0.0, stepxy.y));
output += pixel(v_in.uv + float2( stepxy.x, -stepxy.y));
output += pixel(v_in.uv + float2( stepxy.x, 0.0));
output += pixel(v_in.uv + float2( stepxy.x, stepxy.y));
return output / float4(9.0, 9.0, 9.0, 9.0);
out_color = pixel(v_in.uv);
out_color += pixel(v_in.uv + float2(-stepxy.x, -stepxy.y));
out_color += pixel(v_in.uv + float2(-stepxy.x, 0.0));
out_color += pixel(v_in.uv + float2(-stepxy.x, stepxy.y));
out_color += pixel(v_in.uv + float2( 0.0, -stepxy.y));
out_color += pixel(v_in.uv + float2( 0.0, stepxy.y));
out_color += pixel(v_in.uv + float2( stepxy.x, -stepxy.y));
out_color += pixel(v_in.uv + float2( stepxy.x, 0.0));
out_color += pixel(v_in.uv + float2( stepxy.x, stepxy.y));
return out_color / float4(9.0, 9.0, 9.0, 9.0);
}
float4 PSDrawLowresBilinearRGBA(VertData v_in) : TARGET