From 7c5b50c5e7e573a61f43877dc95d533f01ea3bd2 Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Sat, 30 Nov 2019 18:29:46 +1100 Subject: [PATCH] fixed gross misusage of sampler2D This particular compile issue should be solved, however the majority of its function remains untested for the time being. --- app/node/blend/alphaover/alphaover.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/node/blend/alphaover/alphaover.cpp b/app/node/blend/alphaover/alphaover.cpp index 38c0dbb91..69b429648 100644 --- a/app/node/blend/alphaover/alphaover.cpp +++ b/app/node/blend/alphaover/alphaover.cpp @@ -50,13 +50,16 @@ QString AlphaOverBlend::Code(NodeOutput *output) if (output == texture_output()) { return "#version 110" "\n" - "varying vec2 olive_tex_coord;\n" + "varying vec2 v_texcoord;\n" "\n" "uniform sampler2D base_in;\n" "uniform sampler2D blend_in;\n" "\n" "void main(void) {\n" - " gl_FragColor = base_in - blend_in.a + blend_in;\n" + " vec4 base_col = texture2D(base_in, v_texcoord);\n" + " vec4 blend_col = texture2D(blend_in, v_texcoord);\n" + " \n" + " gl_FragColor = base_col - blend_col.a + blend_col;\n" "}\n"; }