[PATCH] wined3d: Fix the odd line condition in gen_yv12_read().
Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- The original condition is true for every other line, which is incorrect since the chroma has only half the resolution. Fixes comb artifacts around color transitions. --- dlls/wined3d/glsl_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 5ae90148dc8..21aef4606ff 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -12622,7 +12622,7 @@ static void gen_yv12_read(struct wined3d_string_buffer *buffer, * get filtering bleeding. */ /* Read odd lines from the right side (add 0.5 to the x coordinate). */ - shader_addline(buffer, " if (fract(floor(texcoord.y * size.y) * 0.5 + 1.0 / 6.0) >= 0.5)\n"); + shader_addline(buffer, " if (fract(texcoord.y * size.y * 0.25) >= 0.5)\n"); shader_addline(buffer, " texcoord.x += 0.5;\n"); /* Clamp, keep the half pixel origin in mind. */ -- 2.25.1
On Sun, 29 Aug 2021 at 20:19, Anton Baskanov <baskanov(a)gmail.com> wrote:
Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- The original condition is true for every other line, which is incorrect since the chroma has only half the resolution. Fixes comb artifacts around color transitions. --- dlls/wined3d/glsl_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 5ae90148dc8..21aef4606ff 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -12622,7 +12622,7 @@ static void gen_yv12_read(struct wined3d_string_buffer *buffer, * get filtering bleeding. */
/* Read odd lines from the right side (add 0.5 to the x coordinate). */ - shader_addline(buffer, " if (fract(floor(texcoord.y * size.y) * 0.5 + 1.0 / 6.0) >= 0.5)\n"); + shader_addline(buffer, " if (fract(texcoord.y * size.y * 0.25) >= 0.5)\n"); shader_addline(buffer, " texcoord.x += 0.5;\n");
Changing the multiplier from 0.5 to 0.25 makes sense, but it would be helpful to update the comment to make that obvious. It's not clear to me why you're changing the rest of the expression.
On понедельник, 30 августа 2021 г. 20:59:07 +07 you wrote:
On Sun, 29 Aug 2021 at 20:19, Anton Baskanov <baskanov(a)gmail.com> wrote:
Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- The original condition is true for every other line, which is incorrect since the chroma has only half the resolution. Fixes comb artifacts around color transitions. ---
dlls/wined3d/glsl_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 5ae90148dc8..21aef4606ff 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -12622,7 +12622,7 @@ static void gen_yv12_read(struct wined3d_string_buffer *buffer,> * get filtering bleeding. */
/* Read odd lines from the right side (add 0.5 to the x coordinate). */
- shader_addline(buffer, " if (fract(floor(texcoord.y * size.y) * 0.5 + 1.0 / 6.0) >= 0.5)\n"); + shader_addline(buffer, " if (fract(texcoord.y * size.y * 0.25) >= 0.5)\n");> shader_addline(buffer, " texcoord.x += 0.5;\n");
Changing the multiplier from 0.5 to 0.25 makes sense, but it would be helpful to update the comment to make that obvious. It's not clear to me why you're changing the rest of the expression.
Added a comment in v2. I'm changing it because it looks overcomplicated, and I couldn't think of any reason why it should be.
On Tue, 31 Aug 2021 at 07:44, Anton Baskanov <baskanov(a)gmail.com> wrote:
On понедельник, 30 августа 2021 г. 20:59:07 +07 you wrote:
Changing the multiplier from 0.5 to 0.25 makes sense, but it would be helpful to update the comment to make that obvious. It's not clear to me why you're changing the rest of the expression.
Added a comment in v2. I'm changing it because it looks overcomplicated, and I couldn't think of any reason why it should be.
That's likely true, but it's also an independent change; please do the simplification in a separate patch after the fix.
participants (2)
-
Anton Baskanov -
Henri Verbeet