archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix shader compilation.

Browse Source
This commit is contained in:
Clément Foucault
2017-03-18 01:27:50 +01:00
parent c4644b484d
commit cddde85f2c
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/draw/CMakeLists.txt
View File

@@ -111,7 +111,6 @@ data_to_c_simple(modes/shaders/edit_overlay_loosevert_vert.glsl SRC)
data_to_c_simple(modes/shaders/edit_overlay_facedot_frag.glsl SRC)
data_to_c_simple(modes/shaders/edit_overlay_facedot_vert.glsl SRC)
data_to_c_simple(modes/shaders/edit_overlay_mix_frag.glsl SRC)
data_to_c_simple(modes/shaders/edit_overlay_mix_vert.glsl SRC)
data_to_c_simple(modes/shaders/edit_overlay_facefill_vert.glsl SRC)
data_to_c_simple(modes/shaders/edit_overlay_facefill_frag.glsl SRC)
data_to_c_simple(modes/shaders/edit_normals_vert.glsl SRC)

9
source/blender/draw/modes/shaders/edit_overlay_mix_frag.glsl
View File

@@ -1,6 +1,4 @@
in vec4 uvcoordsvar;
out vec4 FragColor;
uniform sampler2D wireColor;
@@ -10,9 +8,10 @@ uniform float alpha;
void main()
{
float wire_depth = texelFetch(wireDepth, uvcoordsvar, 0).r;
float scene_depth = texelFetch(sceneDepth, uvcoordsvar, 0).r;
vec4 wire_color = texelFetch(wireColor, uvcoordsvar, 0).rgba;
ivec2 uv = ivec2(gl_FragCoord.xy);
float wire_depth = texelFetch(wireDepth, uv, 0).r;
float scene_depth = texelFetch(sceneDepth, uv, 0).r;
vec4 wire_color = texelFetch(wireColor, uv, 0).rgba;
FragColor = wire_color;