From f5fc9e7da8cdaa215c27d20050fa729a983924d0 Mon Sep 17 00:00:00 2001 From: jp9000 Date: Sun, 16 Feb 2014 19:55:59 -0700 Subject: [PATCH] Remove redundant constant from conversion shader --- build/data/libobs/format_conversion.effect | 3 +-- libobs/obs-video.c | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/build/data/libobs/format_conversion.effect b/build/data/libobs/format_conversion.effect index ddb4ac31f..895170501 100644 --- a/build/data/libobs/format_conversion.effect +++ b/build/data/libobs/format_conversion.effect @@ -30,7 +30,6 @@ uniform float width_d2; uniform float height_d2; uniform float width_d2_i; uniform float height_d2_i; -uniform float input_width; uniform float input_height; uniform texture2d image; @@ -62,7 +61,7 @@ float4 PSPlanar420(VertInOut vert_in) : TARGET float v_mul = floor(vert_in.uv.y * input_height); #endif - float byte_offset = floor((v_mul + vert_in.uv.x) * input_width) * 4.0; + float byte_offset = floor((v_mul + vert_in.uv.x) * width) * 4.0; float2 sample_pos[4]; diff --git a/libobs/obs-video.c b/libobs/obs-video.c index f89ebe30f..bcfcf56a3 100644 --- a/libobs/obs-video.c +++ b/libobs/obs-video.c @@ -171,7 +171,6 @@ static void render_convert_texture(struct obs_core_video *video, set_eparam(effect, "height_d2", fheight * 0.5f); set_eparam(effect, "width_d2_i", 1.0f / (fwidth * 0.5f)); set_eparam(effect, "height_d2_i", 1.0f / (fheight * 0.5f)); - set_eparam(effect, "input_width", fwidth); set_eparam(effect, "input_height", (float)video->conversion_height); effect_settexture(effect, image, texture);