Re: [v7 05/10] ddraw: Check if surface is a mipmap sublevel through caps in ddraw_surface7_GetPriority().

[Henri Verbeet]

On 10 November 2015 at 14:09, Riccardo Bortolato <rikyz619(a)gmail.com> wrote:
> -    else if (!(surface->surface_desc.ddsCaps.dwCaps2 & managed) || !surface->wined3d_texture)
> +    else if (!(surface->surface_desc.ddsCaps.dwCaps2 & managed) || (surface->surface_desc.ddsCaps.dwCaps2 & DDSCAPS2_MIPMAPSUBLEVEL))

This line is still too long. Stefan already mentioned that this causes
a behaviour change and should have a test.

[v7 05/10] ddraw: Check if surface is a mipmap sublevel through caps in ddraw_surface7_GetPriority().

[Riccardo Bortolato]

Hi Henri,

I will fix the line, as for the test it should be handled already by
test_resource_priority():

[...]
    hr = IDirectDrawSurface7_GetPriority(mipmap, &priority);
    ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x, type managed
mipmap.\n", hr);
[...]

Ciao,
Riccardo

2015-11-12 11:05 GMT+01:00 Henri Verbeet <hverbeet(a)gmail.com>:
> On 10 November 2015 at 14:09, Riccardo Bortolato <rikyz619(a)gmail.com> wrote:
> > -    else if (!(surface->surface_desc.ddsCaps.dwCaps2 & managed) || !surface->wined3d_texture)
> > +    else if (!(surface->surface_desc.ddsCaps.dwCaps2 & managed) || (surface->surface_desc.ddsCaps.dwCaps2 & DDSCAPS2_MIPMAPSUBLEVEL))
>
> This line is still too long. Stefan already mentioned that this causes
> a behaviour change and should have a test.

[v7 05/10] ddraw: Check if surface is a mipmap sublevel through caps in ddraw_surface7_GetPriority().

[Henri Verbeet]

On 12 November 2015 at 11:57, Riccardo Bortolato <rikyz619(a)gmail.com> wrote:
> Hi Henri,
>
> I will fix the line, as for the test it should be handled already by
> test_resource_priority():
>
> [...]
>     hr = IDirectDrawSurface7_GetPriority(mipmap, &priority);
>     ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x, type managed
> mipmap.\n", hr);
> [...]

That's not the non-X+ top-level cube-map face Stefan was worried about.

[v7 05/10] ddraw: Check if surface is a mipmap sublevel through caps in ddraw_surface7_GetPriority().

[Riccardo Bortolato]

Would this test be ok?

https://testbot.winehq.org/JobDetails.pl?Key=18290

(only ran in w8 since other machines don't seem to have d3d..?)

Ciao,
Riccardo

2015-11-13 20:40 GMT+01:00 Henri Verbeet <hverbeet(a)gmail.com>:
> On 12 November 2015 at 11:57, Riccardo Bortolato <rikyz619(a)gmail.com> wrote:
> > Hi Henri,
> >
> > I will fix the line, as for the test it should be handled already by
> > test_resource_priority():
> >
> > [...]
> >     hr = IDirectDrawSurface7_GetPriority(mipmap, &priority);
> >     ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x, type managed
> > mipmap.\n", hr);
> > [...]
>
> That's not the non-X+ top-level cube-map face Stefan was worried about.

[v7 05/10] ddraw: Check if surface is a mipmap sublevel through caps in ddraw_surface7_GetPriority().

[Riccardo Bortolato]

There was a typo in the test, here's an updated run:
https://testbot.winehq.org/JobDetails.pl?Key=18302

If the test is good, no crash with

[v7 05/10] ddraw: Check if surface is a mipmap sublevel through caps
in ddraw_surface7_GetPriority().

applied.

Ciao,
Riccardo

2015-11-17 14:57 GMT+01:00 Riccardo Bortolato <rikyz619(a)gmail.com>:
> Would this test be ok?
>
> https://testbot.winehq.org/JobDetails.pl?Key=18290
>
> (only ran in w8 since other machines don't seem to have d3d..?)
>
> Ciao,
> Riccardo
>
> 2015-11-13 20:40 GMT+01:00 Henri Verbeet <hverbeet(a)gmail.com>:
> > On 12 November 2015 at 11:57, Riccardo Bortolato <rikyz619(a)gmail.com> wrote:
> > > Hi Henri,
> > >
> > > I will fix the line, as for the test it should be handled already by
> > > test_resource_priority():
> > >
> > > [...]
> > >     hr = IDirectDrawSurface7_GetPriority(mipmap, &priority);
> > >     ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x, type managed
> > > mipmap.\n", hr);
> > > [...]
> >
> > That's not the non-X+ top-level cube-map face Stefan was worried about.