Re: [PATCH 3/4] wined3d: Start moving texture format fixups to the formats table.

[Henri Verbeet]

On 7 April 2010 23:12, Roderick Colenbrander <thunderbird2k(a)gmail.com> wrote:
> @@ -236,9 +236,55 @@ struct wined3d_format_texture_info
>     GLint gl_format;
>     GLint gl_type;
>     unsigned int flags;
> +    unsigned int conv_byte_count;
>     GL_SupportedExt extension;
> +    void (*convert)(const BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height);
>  };

...
> -            GL_LUMINANCE_ALPHA,         GL_UNSIGNED_BYTE,
> +            GL_LUMINANCE_ALPHA,         GL_UNSIGNED_BYTE,                 0,
>             WINED3DFMT_FLAG_FILTERING,
> -            WINED3D_GL_EXT_NONE},
> +            WINED3D_GL_EXT_NONE,        NULL},
> Did you test this patch much?

[PATCH 3/4] wined3d: Start moving texture format fixups to the formats table.

[Roderick Colenbrander]

On Thu, Apr 8, 2010 at 11:58 AM, Henri Verbeet <hverbeet(a)gmail.com> wrote:
> On 7 April 2010 23:12, Roderick Colenbrander <thunderbird2k(a)gmail.com> wrote:
> > @@ -236,9 +236,55 @@ struct wined3d_format_texture_info
> >     GLint gl_format;
> >     GLint gl_type;
> >     unsigned int flags;
> > +    unsigned int conv_byte_count;
> >     GL_SupportedExt extension;
> > +    void (*convert)(const BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height);
> >  };
>
> ...
> > -            GL_LUMINANCE_ALPHA,         GL_UNSIGNED_BYTE,
> > +            GL_LUMINANCE_ALPHA,         GL_UNSIGNED_BYTE,                 0,
> >             WINED3DFMT_FLAG_FILTERING,
> > -            WINED3D_GL_EXT_NONE},
> > +            WINED3D_GL_EXT_NONE,        NULL},
> > Did you test this patch much?

Argh, it seems I made a stupid copy&paste error. I wrote the code a
few weeks ago and did test that well on my desktop but on my laptop
(ATi..) the d3d9 V8U8 test and a lot of others never worked :( The
original patch code worked fine, I assumed it would still work (bad,
bad, bad but I only have the laptop) ...

+    unsigned int            byte_count_fixup, Flags;
     GL_SupportedExt extension;
+    void (*convert)(const BYTE *src, BYTE *dst, UINT pitch, UINT width,
+                    UINT height, UINT outpitch);
 } GlPixelFormatDescTemplate;

When I resubmit it, I will test it with another format which has tests
which work on my laptop first.

Roderick