February 2014 - Wine-devel - list.winehq.org

Re: [PATCH 4/5] d3d8/tests: Add a test for sub resource private data.
by Marvin 13 Feb '14

13 Feb '14

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://newtestbot.winehq.org/JobDetails.pl?Key=4885 Your paranoid android. === w8 (32 bit device) === device.c:2572: Test failed: Expected foreground window 00030196, got 0002004E. device.c:3268: Test failed: Expected wndproc 0x410530, got 0x410530.

1 0

Re: [PATCHv5 3/3] d3d9/tests: Add tests for different YUV texture layouts
by Stefan Dösinger 13 Feb '14

13 Feb '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Looks good, thanks! Wrt the testbot failures: It looks like CheckDeviceFormatConversion is in fact the right way to check this - I missed a sentence in the msdn page. I'll send a patch to handle this in this test and yuv_color_test. Real Windows drivers seem to agree with our interpretation of CheckDeviceFormatConversion. (Sorry if this mail arrives twice. I think my mail server swallowed the last one.) Am 2014-02-13 14:52, schrieb Martin Storsjo: > There are no public defines for the YV12 and NV12 > formats, although they do seem to be supported on > actual D3D on windows, at least on the one machine I > tested on. > --- > Removed unnecessary IDirect3DDevice9_SetFVF call. > --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJS/NuWAAoJEN0/YqbEcdMwg+0P/iXXzioHwCQuR4fQxmaZ0iQa FB/3kQd1E2Gn/k0sV9H+Uqb0s+C6g1/QSk11Q4+KaYjmAgcp7j2BJXi81wksInRV wLix2vEqENroLxoDbVVcjEyvlLBENnkCU88ixzK2IjzDuMGrDBNX6xnpDgE7UQIT ra5JiO6hnY2J6LN78QXomwgIQgtbTURhR+NwyXbYk6uYhWGu3+JoB24Ga0NnRH/p zfNXEWYgcrW05lBUCBEwu7+7XHHaYY45l8/p5o33JqiacYJIvFlwJ/H/Kpcc4bQ1 4yky4k/K2DEwpdlhBAzsGheqs5mAZ7xCYytFH+f1kNbDAfowN9M03wgFjfecPPJa 2UENwr0otG2/NdYyqD4FbfLUQZYnAcP4OdZ2lTIE/oZqlsN7T3d7xVhfzqDjRWP+ NhsCfKFTct+v0DWZpqp9Gcyi2aOJtoxuRFpaQIUHcKnEDD6PzBCLutVVERrhI3Gy 55+j7FfH9MfDT08+EOhK+4VXu74CdIgTUaR2Hm2nZFFw9q4Awh4Ixkd4RjjGFAWP RDnNzInSeaBKFYlwHhIxt5lnnVdIsJTkRvQi+j7g3j9YBMncE88YFWWw8wqkmPaE 9QfCvMCQZp7qmf9ak8A2PfCNDQv4jx4LEoJoNjgloLm8qQq0Yu+JYRpNjyvC6MJa pfw1CcMzFR626dZ9dOW2 =69kR -----END PGP SIGNATURE-----

1 1

Re: [PATCH 1/3] atl: Share atl_ax.c with atl100.
by Alexandre Julliard 13 Feb '14

13 Feb '14

Jacek Caban <jacek(a)codeweavers.com> writes: > --- > dlls/atl/Makefile.in | 3 ++- > dlls/atl/atl.spec | 18 +++++++++--------- > dlls/atl/atl_main.c | 48 ------------------------------------------------ > dlls/atl100/atl_ax.c | 15 ++++++++++----- > 4 files changed, 21 insertions(+), 63 deletions(-) It breaks the tests: ../../../tools/runtest -q -P wine -T ../../.. -M atl.dll -p atl_test.exe.so atl_ax && touch atl_ax.ok atl_ax.c:133: Test failed: wcex.style 00004008 make[1]: *** [atl_ax.ok] Error 1 -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: urlmon: Unregister window class on DLL unload.
by Alexandre Julliard 13 Feb '14

13 Feb '14

Jacek Caban <jacek(a)codeweavers.com> writes: > @@ -83,15 +83,50 @@ static LRESULT WINAPI notif_wnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM > return DefWindowProcW(hwnd, msg, wParam, lParam); > } > > +static const WCHAR wszURLMonikerNotificationWindow[] = > + {'U','R','L',' ','M','o','n','i','k','e','r',' ', > + 'N','o','t','i','f','i','c','a','t','i','o','n',' ','W','i','n','d','o','w',0}; > + > +static ATOM notif_wnd_class; > + > +static CRITICAL_SECTION notif_wnd_class_cs; > +static CRITICAL_SECTION_DEBUG notif_wnd_class_cs_dbg = { > + 0, 0, &notif_wnd_class_cs, > + { &notif_wnd_class_cs_dbg.ProcessLocksList, &notif_wnd_class_cs_dbg.ProcessLocksList }, > + 0, 0, { (DWORD_PTR)(__FILE__ ": notif_wnd_class") } > +}; > +static CRITICAL_SECTION notif_wnd_class_cs = { &notif_wnd_class_cs_dbg, -1, 0, 0, 0, 0 }; > + > +static BOOL ensure_notif_wnd_class(void) > +{ > + EnterCriticalSection(&notif_wnd_class_cs); > + > + if(!notif_wnd_class) { > + static WNDCLASSEXW wndclass = { > + sizeof(wndclass), 0, notif_wnd_proc, 0, 0, > + NULL, NULL, NULL, NULL, NULL, > + wszURLMonikerNotificationWindow, NULL > + }; > + > + wndclass.hInstance = hProxyDll; > + notif_wnd_class = RegisterClassExW(&wndclass); > + } > + > + LeaveCriticalSection(&notif_wnd_class_cs); > + > + return notif_wnd_class != 0; > +} You don't really need a whole new critical section for this. Just use InitOnce or interlocked functions. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCHv4 3/3] d3d9/tests: Add tests for different YUV texture layouts
by Stefan Dösinger 13 Feb '14

13 Feb '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-02-13 14:25, schrieb Martin Storsjo: > + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | > D3DFVF_TEX0); + ok(hr == D3D_OK, "IDirect3DDevice9_SetFVF > failed, hr = %#x.\n", hr); Another issue I missed: This call is not needed because you don't call DrawPrimitive and friends. I'll send a patch to clean up the same problems I pointed out here in yuv_color_test. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJS/MzZAAoJEN0/YqbEcdMwZysQAIt75Q8zVg7KHGGuTDPPjq+G vtUI+xZryYVHSubEDG7uawf3L9n3QEdF6l5RIEEi7p40NPG9zf7P2eGGrIOoVpqY L5j1WAhnseHVO6e+vuB0/9M4RvSGHMzdTmzsdIz2/LiGgq3ui13semLC10NvybNy nmSNhU4umJAHR/Ize+3UHwgxOmyhyJvZ6I1ieMdprxmmC8LeOM+BAeY+hPZ6T671 jqwK64hRxCJVZdcqbHIV/0SAoFPoy9ndDZvcOe/a0FSqPQJGKCRWVDWd/JF2vH0p utAQcw9exQUga4F+0ds/60TMOVT87V+O4yyV81HeF+eYXR3U7W/IgvNPtvZW/HIM 0QMHYBEXKOLKXmqB2QONBC92l0TZcMZ3prXscexwpsOVMWyr6OHKYDBuo4Doc7av 3bPR9SGDY/V2wCJLIdjXZIWWO9C35JYDN2hrtyhAaCoIN2CBJDsqCPBbA4NcYFiy UOQB9QPExcK0f/Jg2Gqx1nbQ3lqMuCwOz8l3nv4Xwf/sJDbB2WXm6pllR/dmXppG DKx3G9/CrZkKukaSH93BNj9a1BDhIkNbA99CffJfuqH3qj7/QB9n4+VLDZQSB9E7 ykL4qXxXMZcUT47BtHS6wWV/QqRPtW3cG3/a0EUI03+WclYYt0V6KJX3izQEu6Fm XUUxgRjpsTexsjs6Hk/o =xV6C -----END PGP SIGNATURE-----

1 0

Re: [PATCHv3 3/3] d3d9/tests: Add tests for different YUV texture layouts
by Stefan Dösinger 13 Feb '14

13 Feb '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, There are two more style issues I missed in my previous reviews: > + static const struct > + { > + DWORD color1, color2; > + DWORD rgb1, rgb2; > + } > + test_data[] = > + { > + { 0x000000, 0xffffff, 0x00008800, 0x00ff7dff }, > + { 0xff0000, 0x00ffff, 0x004aff14, 0x00b800ee }, > + { 0x00ff00, 0xff00ff, 0x000024ee, 0x00ffe114 }, > + { 0x0000ff, 0xffff00, 0x00b80000, 0x004affff }, > + { 0xffff00, 0x0000ff, 0x004affff, 0x00b80000 }, > + { 0xff00ff, 0x00ff00, 0x00ffe114, 0x000024ee }, > + { 0x00ffff, 0xff0000, 0x00b800ee, 0x004aff14 }, > + { 0xffffff, 0x000000, 0x00ff7dff, 0x00008800 }, 4 space indents in the data block. > + DWORD color = (x < width/2 && y < height/2) ? test_data[i].color1 : test_data[i].color2; Please use spaces consistently around binary opertions. (i.e. x < width / 2) etc. I think I've also seen some multiplications that are affected. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJS/MXbAAoJEN0/YqbEcdMwJjQP/2OzFt2DE5iEhWuwTOACdXSM 1dhlZnmz4bH+sUymen1dvxIXCLxhKWlLGl5cPkkFk2OCj0B2YlYaheV4qDJj5Cye zfKyrKjv1nfwk86g5YepoS2Ee/ZUdiMkNF+5tq9FkAa5LjStTgpC4KU6Vxpye1i5 Wmv2IBc0jAe84pRoDuZGYt0CT/RqgdHo8yvouK6Z5ytS7ClpLYWrLt/FYhpk0Sjj ITa6l7NksgBVN4ByZW5Pyk9Hf8gZ44qx9J8rzxOGBxLkGGpTOuGLB9MsE4riYwGy M1X10s7llWCs7Qy8Hs96Gg4vfHMS09xgfuYlj3UBKaXJVyRhTIDJpc7iqXA4WDaN mWJUrVaHCPha6ZGW2llC43wh5zECMH1/v98veRICbYqFhlKFzWuhtLq4BOwloJj4 fvJaYivFhkyDsn1y5grO8dGYjirZFNkiG/dIj7XpO8lh+4xGuTrBCO5hWBqICLV2 uQX6woh2MKv7ddFmRdvUuL/emV8oKBKga9t8LgTQdeSX7v//5aPtCLeawPKczpIB yPv2zUIei3G5TAcLlter66KGyvQZgXhiZXwtwq0wCWvNWRitjTztLp+2jrg9uWJ1 JiuhXuBFbsI8r/iiTrYXmZv1vX6BBFfL8I59SS0+J/7dFFZ63F5ePqEsl0WKSQ0W 0haQuTaKNLiVBlP1pmkF =fSNX -----END PGP SIGNATURE-----

1 0

Re: [PATCHv4 2/3] wined3d: Use an rbtree for storing shaders for texture format conversion/blitting
by Stefan Dösinger 13 Feb '14

13 Feb '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Looks good to me. Am 2014-02-13 13:05, schrieb Martin Storsjo: > --- Fixed the final style issues and added comments about who > activates the GL context. --- dlls/wined3d/arb_program_shader.c | > 204 +++++++++++++++++++++++++------------- 1 file changed, 134 > insertions(+), 70 deletions(-) > > diff --git a/dlls/wined3d/arb_program_shader.c > b/dlls/wined3d/arb_program_shader.c index 93a6e31..a273eac 100644 > --- a/dlls/wined3d/arb_program_shader.c +++ > b/dlls/wined3d/arb_program_shader.c @@ -6768,22 +6768,74 @@ const > struct fragment_pipeline arbfp_fragment_pipeline = { > arbfp_fragmentstate_template, }; > > -struct arbfp_blit_priv { - GLenum yuy2_rect_shader, > yuy2_2d_shader; - GLenum uyvy_rect_shader, uyvy_2d_shader; - > GLenum yv12_rect_shader, yv12_2d_shader; - GLenum > nv12_rect_shader, nv12_2d_shader; - GLenum p8_rect_shader, > p8_2d_shader; +struct arbfp_blit_type +{ + enum complex_fixup > fixup; + GLenum textype; +}; + +struct arbfp_blit_desc +{ + > GLenum shader; + struct arbfp_blit_type type; + struct > wine_rb_entry entry; +}; + +struct arbfp_blit_priv +{ + struct > wine_rb_tree shaders; GLuint palette_texture; }; > > +static int arbfp_blit_type_compare(const void *key, const struct > wine_rb_entry *entry) +{ + const struct arbfp_blit_type *ka = > key; + const struct arbfp_blit_type *kb = > &WINE_RB_ENTRY_VALUE(entry, const struct arbfp_blit_desc, > entry)->type; + + if (ka->fixup != kb->fixup) + return > ka->fixup < kb->fixup ? -1 : 1; + if (ka->textype != > kb->textype) + return ka->textype < kb->textype ? -1 : 1; + > return 0; +} + +/* Context activation is done by the caller. */ > +static void arbfp_free_blit_shader(struct wine_rb_entry *entry, > void *context) +{ + const struct wined3d_gl_info *gl_info = > context; + struct arbfp_blit_desc *entry_arb = > WINE_RB_ENTRY_VALUE(entry, struct arbfp_blit_desc, entry); + + > GL_EXTCALL(glDeleteProgramsARB(1, &entry_arb->shader)); + > checkGLcall("glDeleteProgramsARB(1, &entry_arb->shader)"); + > HeapFree(GetProcessHeap(), 0, entry_arb); +} + +const struct > wine_rb_functions wined3d_arbfp_blit_rb_functions = +{ + > wined3d_rb_alloc, + wined3d_rb_realloc, + wined3d_rb_free, + > arbfp_blit_type_compare, +}; + static HRESULT > arbfp_blit_alloc(struct wined3d_device *device) { + struct > arbfp_blit_priv *priv; device->blit_priv = > HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct > arbfp_blit_priv)); if(!device->blit_priv) { ERR("Out of > memory\n"); return E_OUTOFMEMORY; } + priv = device->blit_priv; > + + if (wine_rb_init(&priv->shaders, > &wined3d_arbfp_blit_rb_functions) == -1) + { + > ERR("Failed to initialize rbtree.\n"); + > HeapFree(GetProcessHeap(), 0, device->blit_priv); + > device->blit_priv = NULL; + return E_OUTOFMEMORY; + } + > return WINED3D_OK; } > > @@ -6793,17 +6845,8 @@ static void arbfp_blit_free(struct > wined3d_device *device) const struct wined3d_gl_info *gl_info = > &device->adapter->gl_info; struct arbfp_blit_priv *priv = > device->blit_priv; > > - GL_EXTCALL(glDeleteProgramsARB(1, &priv->yuy2_rect_shader)); - > GL_EXTCALL(glDeleteProgramsARB(1, &priv->yuy2_2d_shader)); - > GL_EXTCALL(glDeleteProgramsARB(1, &priv->uyvy_rect_shader)); - > GL_EXTCALL(glDeleteProgramsARB(1, &priv->uyvy_2d_shader)); - > GL_EXTCALL(glDeleteProgramsARB(1, &priv->yv12_rect_shader)); - > GL_EXTCALL(glDeleteProgramsARB(1, &priv->yv12_2d_shader)); - > GL_EXTCALL(glDeleteProgramsARB(1, &priv->nv12_rect_shader)); - > GL_EXTCALL(glDeleteProgramsARB(1, &priv->nv12_2d_shader)); - > GL_EXTCALL(glDeleteProgramsARB(1, &priv->p8_rect_shader)); - > GL_EXTCALL(glDeleteProgramsARB(1, &priv->p8_2d_shader)); - > checkGLcall("Delete yuv and p8 programs"); + > wine_rb_destroy(&priv->shaders, arbfp_free_blit_shader, > &device->adapter->gl_info); + checkGLcall("Delete blit > programs"); > > if (priv->palette_texture) gl_info->gl_ops.gl.p_glDeleteTextures(1, > &priv->palette_texture); @@ -7196,12 +7239,14 @@ static BOOL > gen_nv12_read(struct wined3d_shader_buffer *buffer, GLenum > textype, return TRUE; } > > +/* Context activation is done by the caller. */ static GLuint > gen_p8_shader(struct arbfp_blit_priv *priv, const struct > wined3d_gl_info *gl_info, GLenum textype) { GLenum shader; struct > wined3d_shader_buffer buffer; GLint pos; + struct > arbfp_blit_desc *desc; > > /* Shader header */ if (!shader_buffer_init(&buffer)) @@ -7249,14 > +7294,34 @@ static GLuint gen_p8_shader(struct arbfp_blit_priv > *priv, shader_arb_dump_program_source(buffer.buffer); } > > - if (textype == GL_TEXTURE_RECTANGLE_ARB) - > priv->p8_rect_shader = shader; - else - > priv->p8_2d_shader = shader; - shader_buffer_free(&buffer); > > + desc = HeapAlloc(GetProcessHeap(), 0, sizeof(*desc)); + if > (!desc) + { + ERR("Out of memory\n"); + goto > err_out; + } + + desc->type.textype = textype; + > desc->type.fixup = COMPLEX_FIXUP_P8; + desc->shader = shader; + > if (wine_rb_put(&priv->shaders, &desc->type, &desc->entry) == -1) + > { + ERR("Out of memory\n"); + goto err_out; + } + > return shader; + +err_out: + GL_EXTCALL(glDeleteProgramsARB(1, > &shader)); + checkGLcall("GL_EXTCALL(glDeleteProgramsARB(1, > &shader))"); + > GL_EXTCALL(glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, 0)); + > checkGLcall("glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, 0)"); + > if (desc) + HeapFree(GetProcessHeap(), 0, desc); + return > 0; } > > /* Context activation is done by the caller. */ @@ -7298,6 +7363,7 > @@ static GLuint gen_yuv_shader(struct arbfp_blit_priv *priv, const > struct wined3d_ struct wined3d_shader_buffer buffer; char > luminance_component; GLint pos; + struct arbfp_blit_desc *desc; > > /* Shader header */ if (!shader_buffer_init(&buffer)) @@ -7428,34 > +7494,32 @@ static GLuint gen_yuv_shader(struct arbfp_blit_priv > *priv, const struct wined3d_ > > shader_buffer_free(&buffer); > > - switch (yuv_fixup) + desc = HeapAlloc(GetProcessHeap(), 0, > sizeof(*desc)); + if (!desc) { - case > COMPLEX_FIXUP_YUY2: - if (textype == > GL_TEXTURE_RECTANGLE_ARB) priv->yuy2_rect_shader = shader; - > else priv->yuy2_2d_shader = shader; - break; - - > case COMPLEX_FIXUP_UYVY: - if (textype == > GL_TEXTURE_RECTANGLE_ARB) priv->uyvy_rect_shader = shader; - > else priv->uyvy_2d_shader = shader; - break; - - > case COMPLEX_FIXUP_YV12: - if (textype == > GL_TEXTURE_RECTANGLE_ARB) priv->yv12_rect_shader = shader; - > else priv->yv12_2d_shader = shader; - break; + > ERR("Out of memory\n"); + goto err_out; + } > > - case COMPLEX_FIXUP_NV12: - if (textype == > GL_TEXTURE_RECTANGLE_ARB) - priv->nv12_rect_shader = > shader; - else - priv->nv12_2d_shader = > shader; - break; - default: - > ERR("Unsupported complex fixup: %d\n", yuv_fixup); + > desc->type.textype = textype; + desc->type.fixup = yuv_fixup; + > desc->shader = shader; + if (wine_rb_put(&priv->shaders, > &desc->type, &desc->entry) == -1) + { + ERR("Out of > memory\n"); + goto err_out; } > > return shader; + +err_out: + GL_EXTCALL(glDeleteProgramsARB(1, > &shader)); + checkGLcall("GL_EXTCALL(glDeleteProgramsARB(1, > &shader))"); + > GL_EXTCALL(glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, 0)); + > checkGLcall("glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, 0)"); + > if (desc) + HeapFree(GetProcessHeap(), 0, desc); + return > 0; } > > /* Context activation is done by the caller. */ @@ -7467,6 +7531,8 > @@ static HRESULT arbfp_blit_set(void *blit_priv, struct > wined3d_context *context, enum complex_fixup fixup; const struct > wined3d_gl_info *gl_info = context->gl_info; GLenum textype = > surface->container->target; + struct wine_rb_entry *entry; + > struct arbfp_blit_type type; > > if (surface->flags & SFLAG_CONVERTED) { @@ -7487,39 +7553,37 @@ > static HRESULT arbfp_blit_set(void *blit_priv, struct > wined3d_context *context, > > fixup = get_complex_fixup(surface->resource.format->color_fixup); > > - switch(fixup) + type.fixup = fixup; + type.textype = > textype; + entry = wine_rb_get(&priv->shaders, &type); + if > (entry) { - case COMPLEX_FIXUP_YUY2: - shader = > textype == GL_TEXTURE_RECTANGLE_ARB ? priv->yuy2_rect_shader : > priv->yuy2_2d_shader; - break; - - case > COMPLEX_FIXUP_UYVY: - shader = textype == > GL_TEXTURE_RECTANGLE_ARB ? priv->uyvy_rect_shader : > priv->uyvy_2d_shader; - break; - - case > COMPLEX_FIXUP_YV12: - shader = textype == > GL_TEXTURE_RECTANGLE_ARB ? priv->yv12_rect_shader : > priv->yv12_2d_shader; - break; - - case > COMPLEX_FIXUP_NV12: - shader = textype == > GL_TEXTURE_RECTANGLE_ARB ? priv->nv12_rect_shader : > priv->nv12_2d_shader; - break; - - case > COMPLEX_FIXUP_P8: - shader = textype == > GL_TEXTURE_RECTANGLE_ARB ? priv->p8_rect_shader : > priv->p8_2d_shader; - if (!shader) shader = > gen_p8_shader(priv, gl_info, textype); + struct > arbfp_blit_desc *desc = WINE_RB_ENTRY_VALUE(entry, struct > arbfp_blit_desc, entry); + shader = desc->shader; + } + > else + { + switch (fixup) + { + case > COMPLEX_FIXUP_P8: + shader = gen_p8_shader(priv, > gl_info, textype); + break; > > - upload_palette(surface, context); - break; > + default: + shader = > gen_yuv_shader(priv, gl_info, fixup, textype); + > break; + } > > - default: + if (!shader) + { > FIXME("Unsupported complex fixup %#x, not setting a shader\n", > fixup); gl_info->gl_ops.gl.p_glEnable(textype); > checkGLcall("glEnable(textype)"); return E_NOTIMPL; + } } - > - if (!shader) shader = gen_yuv_shader(priv, gl_info, fixup, > textype); + if (fixup == COMPLEX_FIXUP_P8) + > upload_palette(surface, context); > > gl_info->gl_ops.gl.p_glEnable(GL_FRAGMENT_PROGRAM_ARB); > checkGLcall("glEnable(GL_FRAGMENT_PROGRAM_ARB)"); > -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJS/MUJAAoJEN0/YqbEcdMwJDEQAIEBkWRt2YIly+I+2jO2Y2al MxewjsCeQRf2uFnn4QIVNSfBOrjx6tq5d4aaj0pMlW2O98nXpVJWrHH5suqdX3IP F57tC6bLkucvwuutKFn+h5JohkHw7mjiPjDMYV2H2Lml3Yy0CXDfpSUJsREfTXgl YefKfzxIjckRV/u64kCTOxXCjkeI1LakEWIs8zL8QKXHSUIQtUHfN5uNynbhSnNq SU7+d3B/p/ZFvdOpT6HyhXHyGmx584CcmDTIz9tj6JG0oWmHE6dLZoIrgR/f32iH M0SYfxFEpRhv26a3NFEx98VAHTarZKkMTrcu6QQIgZ0RiC1jpSOvidk98sIK7dbr T+ynOho0GaZt5ZC0pvc1w6GPw7sf040Oz2JcSqIxDX+S5JjqG7PsMvJSYcziY8xJ eBrYgpO/Db5DVyOHfEuFbcS6fyLcO9P9hi2VvhQx2TR9q2XQEMklMamo+OTGng5t cx61mfvCLUF/BsQBteW/SAIHaUGfKgUOgmPIJpucssVbULVXnxI1op1PcczvT6JP xqaG+GiXzuDMulcQR+gnYz7oWnMWj2AA+bPVrTKUhZTbEupUgG9j8CsxeJ678tlk bBKK1p/3UBz1+oc7Qo+Yu6mBVSjPSxwczxmErWe+L7K1kP2L8vtqYg06CSTPH8t7 Y6kf6yuWGIbyapYMcuAO =jA/i -----END PGP SIGNATURE-----

1 0

Re: [PATCHv3 3/3] d3d9/tests: Add tests for different YUV texture layouts
by Marvin 13 Feb '14

13 Feb '14

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://newtestbot.winehq.org/JobDetails.pl?Key=4869 Your paranoid android. === w8 (32 bit visual) === visual.c:10636: Test failed: IDirect3DDevice9_StretchRect failed with 0x8876086c. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(0/4), pixel 80 60, expected 0x8800. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(0/4), pixel 240 60, expected 0x8800. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(0/4), pixel 400 60, expected 0xff7dff. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(0/4), pixel 560 60, expected 0xff7dff. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(1/4), pixel 80 180, expected 0x8800. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(1/4), pixel 240 180, expected 0x8800. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(1/4), pixel 400 180, expected 0xff7dff. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(1/4), pixel 560 180, expected 0xff7dff. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(2/4), pixel 80 300, expected 0xff7dff. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(2/4), pixel 240 300, expected 0xff7dff. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(2/4), pixel 400 300, expected 0xff7dff. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(2/4), pixel 560 300, expected 0xff7dff. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(3/4), pixel 80 420, expected 0xff7dff. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(3/4), pixel 240 420, expected 0xff7dff. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(3/4), pixel 400 420, expected 0xff7dff. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(3/4), pixel 560 420, expected 0xff7dff. visual.c:10636: Test failed: IDirect3DDevice9_StretchRect failed with 0x8876086c. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(0/4), pixel 80 60, expected 0x4aff14. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(0/4), pixel 240 60, expected 0x4aff14. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(0/4), pixel 400 60, expected 0xb800ee. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(0/4), pixel 560 60, expected 0xb800ee. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(1/4), pixel 80 180, expected 0x4aff14. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(1/4), pixel 240 180, expected 0x4aff14. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(1/4), pixel 400 180, expected 0xb800ee. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(1/4), pixel 560 180, expected 0xb800ee. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(2/4), pixel 80 300, expected 0xb800ee. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(2/4), pixel 240 300, expected 0xb800ee. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(2/4), pixel 400 300, expected 0xb800ee. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(2/4), pixel 560 300, expected 0xb800ee. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(3/4), pixel 80 420, expected 0xb800ee. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(3/4), pixel 240 420, expected 0xb800ee. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(3/4), pixel 400 420, expected 0xb800ee. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(3/4), pixel 560 420, expected 0xb800ee. visual.c:10636: Test failed: IDirect3DDevice9_StretchRect failed with 0x8876086c. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(0/4), pixel 80 60, expected 0x24ee. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(0/4), pixel 240 60, expected 0x24ee. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(0/4), pixel 400 60, expected 0xffe114. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(0/4), pixel 560 60, expected 0xffe114. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(1/4), pixel 80 180, expected 0x24ee. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(1/4), pixel 240 180, expected 0x24ee. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(1/4), pixel 400 180, expected 0xffe114. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(1/4), pixel 560 180, expected 0xffe114. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(2/4), pixel 80 300, expected 0xffe114. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(2/4), pixel 240 300, expected 0xffe114. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(2/4), pixel 400 300, expected 0xffe114. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(2/4), pixel 560 300, expected 0xffe114. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(3/4), pixel 80 420, expected 0xffe114. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(3/4), pixel 240 420, expected 0xffe114. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(3/4), pixel 400 420, expected 0xffe114. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(3/4), pixel 560 420, expected 0xffe114. visual.c:10636: Test failed: IDirect3DDevice9_StretchRect failed with 0x8876086c. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(0/4), pixel 80 60, expected 0xb80000. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(0/4), pixel 240 60, expected 0xb80000. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(0/4), pixel 400 60, expected 0x4affff. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(0/4), pixel 560 60, expected 0x4affff. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(1/4), pixel 80 180, expected 0xb80000. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(1/4), pixel 240 180, expected 0xb80000. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(1/4), pixel 400 180, expected 0x4affff. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(1/4), pixel 560 180, expected 0x4affff. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(2/4), pixel 80 300, expected 0x4affff. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(2/4), pixel 240 300, expected 0x4affff. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(2/4), pixel 400 300, expected 0x4affff. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(2/4), pixel 560 300, expected 0x4affff. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(3/4), pixel 80 420, expected 0x4affff. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(3/4), pixel 240 420, expected 0x4affff. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(3/4), pixel 400 420, expected 0x4affff. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(3/4), pixel 560 420, expected 0x4affff. visual.c:10636: Test failed: IDirect3DDevice9_StretchRect failed with 0x8876086c. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(0/4), pixel 80 60, expected 0x4affff. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(0/4), pixel 240 60, expected 0x4affff. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(0/4), pixel 400 60, expected 0xb80000. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(0/4), pixel 560 60, expected 0xb80000. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(1/4), pixel 80 180, expected 0x4affff. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(1/4), pixel 240 180, expected 0x4affff. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(1/4), pixel 400 180, expected 0xb80000. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(1/4), pixel 560 180, expected 0xb80000. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(2/4), pixel 80 300, expected 0xb80000. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(2/4), pixel 240 300, expected 0xb80000. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(2/4), pixel 400 300, expected 0xb80000. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(2/4), pixel 560 300, expected 0xb80000. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(3/4), pixel 80 420, expected 0xb80000. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(3/4), pixel 240 420, expected 0xb80000. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(3/4), pixel 400 420, expected 0xb80000. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(3/4), pixel 560 420, expected 0xb80000. visual.c:10636: Test failed: IDirect3DDevice9_StretchRect failed with 0x8876086c. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(0/4), pixel 80 60, expected 0xffe114. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(0/4), pixel 240 60, expected 0xffe114. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(0/4), pixel 400 60, expected 0x24ee. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(0/4), pixel 560 60, expected 0x24ee. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(1/4), pixel 80 180, expected 0xffe114. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(1/4), pixel 240 180, expected 0xffe114. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(1/4), pixel 400 180, expected 0x24ee. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(1/4), pixel 560 180, expected 0x24ee. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(2/4), pixel 80 300, expected 0x24ee. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(2/4), pixel 240 300, expected 0x24ee. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(2/4), pixel 400 300, expected 0x24ee. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(2/4), pixel 560 300, expected 0x24ee. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(3/4), pixel 80 420, expected 0x24ee. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(3/4), pixel 240 420, expected 0x24ee. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(3/4), pixel 400 420, expected 0x24ee. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(3/4), pixel 560 420, expected 0x24ee. visual.c:10636: Test failed: IDirect3DDevice9_StretchRect failed with 0x8876086c. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(0/4), pixel 80 60, expected 0xb800ee. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(0/4), pixel 240 60, expected 0xb800ee. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(0/4), pixel 400 60, expected 0x4aff14. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(0/4), pixel 560 60, expected 0x4aff14. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(1/4), pixel 80 180, expected 0xb800ee. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(1/4), pixel 240 180, expected 0xb800ee. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(1/4), pixel 400 180, expected 0x4aff14. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(1/4), pixel 560 180, expected 0x4aff14. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(2/4), pixel 80 300, expected 0x4aff14. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(2/4), pixel 240 300, expected 0x4aff14. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(2/4), pixel 400 300, expected 0x4aff14. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(2/4), pixel 560 300, expected 0x4aff14. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(3/4), pixel 80 420, expected 0x4aff14. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(3/4), pixel 240 420, expected 0x4aff14. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(3/4), pixel 400 420, expected 0x4aff14. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(3/4), pixel 560 420, expected 0x4aff14. visual.c:10636: Test failed: IDirect3DDevice9_StretchRect failed with 0x8876086c. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(0/4), pixel 80 60, expected 0xff7dff. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(0/4), pixel 240 60, expected 0xff7dff. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(0/4), pixel 400 60, expected 0x8800. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(0/4), pixel 560 60, expected 0x8800. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(1/4), pixel 80 180, expected 0xff7dff. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(1/4), pixel 240 180, expected 0xff7dff. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(1/4), pixel 400 180, expected 0x8800. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(1/4), pixel 560 180, expected 0x8800. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(2/4), pixel 80 300, expected 0x8800. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(2/4), pixel 240 300, expected 0x8800. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(2/4), pixel 400 300, expected 0x8800. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(2/4), pixel 560 300, expected 0x8800. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (0/4)/(3/4), pixel 80 420, expected 0x8800. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (1/4)/(3/4), pixel 240 420, expected 0x8800. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (2/4)/(3/4), pixel 400 420, expected 0x8800. visual.c:10649: Test failed: Format D3DFMT_YUY2: Got color 0 for pixel (3/4)/(3/4), pixel 560 420, expected 0x8800.

1 0

Re: [PATCHv2 3/3] d3d9/tests: Add tests for different YUV texture layouts
by Stefan Dösinger 13 Feb '14

13 Feb '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, You still have a few formatting issues in this patch, I've quoted the ones I found below. I ran the test on my Windows boxes and it passed on the following devices: Windows 7 x86_64, Radeon HD 5770 Windows 7 x86_64, Radeon X1600 Windows 7 x32, Nvidia GeForce 9600 Windows Vista x32, Nvidia GeForce 7400 It did not pass on my very ancient Windows XP x32 laptop with a Radeon 9000 Mobility. It fails there the same way as on the testbot - the card claims to support YUY2 and YV12, but the StretchRect call fails with D3DERR_INVALIDCALL. Do you have any idea why that might happen? If not maybe the best solution is to accept the error with broken() and skip the rest of the test. There's IDirect3D9::CheckDeviceFormatConversion, but according to msdn it only tests backbuffer and adapter format compatibility. That's not the way we implement it, but I don't think we have tests to find out how it's really supposed to behave. Fwiw none of the above machines claims I420 support. There are plenty of other odd formats though. Am 2014-02-12 21:05, schrieb Martin Storsjo: Use 8 space indentation vs the first line of the if and put the && into the next line. Same as above. Curly bracket placement. Same. 8 space indent on line contiuation as in if conditions. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJS/KsdAAoJEN0/YqbEcdMwckoP/RTST4uApXJwApHZeP5DC7M9 9gN0k8G/zKFN/79I9RPC/fVhMbk/uniloVK+uuYwKmNsoFLRnT1ikg320D09KclZ R1+sLK3Cr9x8lR9NAbR/NsCglRupoE3qX916T1QVApWgeGb9WvExkto6rP+DhI8L sw5T/Rtr3odiMKdSXyllXNgZl0cljhd821OXn5bl6A1VpRO5tXJr7WFfMSIl5TUT VDOub/n2bPwKB38wUwxSgd+m/9hgl+4U+z4V1gfyichgVp4gZKSRH+mr96WI3trc eGjWxtH4+kk1LLshxjCaQOJ0fqoMDQbxJjUBtkAqSKYbCvd7KEfbcTcyKfd4mOHX ZgTqsMRlB/jVK2ugmojf2JgCasecDhENcibjOH2DHXe2SbUUx/QV7cFzjGEGiMNj fOBW0B/f1WJHuyYcKrpw1EWhsR4lFjM6uehmNC+ndA78zy5NPg15U6iBS0ArwZLN kSqbUd6VJy74zVs8CH/v6/cbjUhHguyYcO77/I7k9CMVV3rssgO2oV4GyOnfJGZg dLqN+mQGD3mZhhBhTZrqmuSK1BoPMgA89O7kbJB/x+l3f5XNuCmCxzK4ydgUsr11 kJ/gjrnc51/snAE61+qUZ7sxvGdJKqNdk19Xwrtjp7z2NIcJaNVT8qB41JJFrr4/ Woj0DvcYK1wrmPg8XSJ3 =Hogg -----END PGP SIGNATURE-----

2 1

Re: [PATCHv3] wined3d: Use an rbtree for storing shaders for texture format conversion/blitting
by Stefan Dösinger 13 Feb '14

13 Feb '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, Two more non-functional nitpicks: Am 2014-02-13 11:16, schrieb Martin Storsjo: > +static void arbfp_free_blit_shader(struct wine_rb_entry *entry, void *context) > +{ > + const struct wined3d_gl_info *gl_info = context; > + struct arbfp_blit_desc *entry_arb = WINE_RB_ENTRY_VALUE(entry, struct arbfp_blit_desc, entry); > + > + GL_EXTCALL(glDeleteProgramsARB(1, &entry_arb->shader)); > + checkGLcall("glDeleteProgramsARB(1, &entry_arb->shader)"); > + HeapFree(GetProcessHeap(), 0, entry_arb); > +} Please add a comment /* Context activation is done by the caller. */ above the function. While you're at it, please also add it above gen_p8_shader. It is not necessary to add this comment above gen_planar_yuv_read and gen_nv12_read because those functions do not call OpenGL functions. > + switch (fixup) > + { > case COMPLEX_FIXUP_P8: > - shader = textype == GL_TEXTURE_RECTANGLE_ARB ? priv->p8_rect_shader : priv->p8_2d_shader; > - if (!shader) shader = gen_p8_shader(priv, gl_info, textype); > - > - upload_palette(surface, context); > + shader = gen_p8_shader(priv, gl_info, textype); > break; > > default: > + shader = gen_yuv_shader(priv, gl_info, fixup, textype); > + break; > + } Please add 4 spaces of indentation, like this switch (fixup) { case foo: code(); more_code(); break; case bar: other_code(); break; } Other than that the code looks good to me. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJS/K4ZAAoJEN0/YqbEcdMwHzoP/0/wPibZu3Jy3MAlACpiPlq9 0inM3Egyh/qfYw7Qi8I+2eaAYZKZYy9LZDJ89fXjS87Ip8v+ryoGMXpLeCGgGze4 VV7F/mr/V7OKHs6ObFipmO4pEgqYn6gbc5x87SCuHvEwz70CUOfZiTPzt94d71Z4 Hr69M6wSU4DNOndOr83pJNjEQAff9qIecvNZwp/xlvgg/rZSdr3uMBLap/fJmAGy NtbJVgIAtCovkANBTDmE55U8bPQLdRQapZbBH+JQN3LMxmg3C4pJ++Wnc/1kRmmv 3ZvVSBHdwTK7dPuLx7aGl66gMYo9IdyGUYvD+Jk2GchfhRowwC2FcWDhLEDRhWpd ahQnoa8bTuKgtlTwygWZLm748e8asaC1Chcr5pKj+IZDo/F/qq6U46LL9K5SBFC1 1sTjF578QQ3K5LiCrGv6ivsHvJq+JkwQz0QxDhqJ4Bs0lJ5LEvC54l7XjumDvtfg 8+4slUf/FKhZNjgp/XRF/qip1+hwMehZULlHIo0CBzSjBiNxxKA+IQq/CeKfjAMa cjPkhRW42H/l47IJthepxuMaoNO5WAp75TXha2vwHQY/Axs8AsKqyzTyImuMa50U b+kHVilfW9hjSJWSGbLb7JgCurgTMKHkt1W2+6OQpbFOBrCihr3uQWAifo8+IuTP 3U5Y0hUe8rU9IKyDS0eO =AU5Y -----END PGP SIGNATURE-----

1 0