wined3d: WINED3DTEXF_NONE only makes sense as a mip filter.
This commit is contained in:
parent
9e8f7898c9
commit
7165bd19c1
|
@ -2639,7 +2639,7 @@ IDirect3DDeviceImpl_7_SetRenderState(IDirect3DDevice7 *iface,
|
||||||
{
|
{
|
||||||
case D3DRENDERSTATE_TEXTUREMAG:
|
case D3DRENDERSTATE_TEXTUREMAG:
|
||||||
{
|
{
|
||||||
WINED3DTEXTUREFILTERTYPE tex_mag = WINED3DTEXF_NONE;
|
WINED3DTEXTUREFILTERTYPE tex_mag = WINED3DTEXF_POINT;
|
||||||
|
|
||||||
switch ((D3DTEXTUREFILTER) Value)
|
switch ((D3DTEXTUREFILTER) Value)
|
||||||
{
|
{
|
||||||
|
@ -2663,7 +2663,7 @@ IDirect3DDeviceImpl_7_SetRenderState(IDirect3DDevice7 *iface,
|
||||||
|
|
||||||
case D3DRENDERSTATE_TEXTUREMIN:
|
case D3DRENDERSTATE_TEXTUREMIN:
|
||||||
{
|
{
|
||||||
WINED3DTEXTUREFILTERTYPE tex_min = WINED3DTEXF_NONE;
|
WINED3DTEXTUREFILTERTYPE tex_min = WINED3DTEXF_POINT;
|
||||||
WINED3DTEXTUREFILTERTYPE tex_mip = WINED3DTEXF_NONE;
|
WINED3DTEXTUREFILTERTYPE tex_mip = WINED3DTEXF_NONE;
|
||||||
|
|
||||||
switch ((D3DTEXTUREFILTER) Value)
|
switch ((D3DTEXTUREFILTER) Value)
|
||||||
|
@ -2675,11 +2675,11 @@ IDirect3DDeviceImpl_7_SetRenderState(IDirect3DDevice7 *iface,
|
||||||
tex_min = WINED3DTEXF_LINEAR;
|
tex_min = WINED3DTEXF_LINEAR;
|
||||||
break;
|
break;
|
||||||
case D3DFILTER_MIPNEAREST:
|
case D3DFILTER_MIPNEAREST:
|
||||||
tex_min = WINED3DTEXF_NONE;
|
tex_min = WINED3DTEXF_POINT;
|
||||||
tex_mip = WINED3DTEXF_POINT;
|
tex_mip = WINED3DTEXF_POINT;
|
||||||
break;
|
break;
|
||||||
case D3DFILTER_MIPLINEAR:
|
case D3DFILTER_MIPLINEAR:
|
||||||
tex_min = WINED3DTEXF_NONE;
|
tex_min = WINED3DTEXF_POINT;
|
||||||
tex_mip = WINED3DTEXF_LINEAR;
|
tex_mip = WINED3DTEXF_LINEAR;
|
||||||
break;
|
break;
|
||||||
case D3DFILTER_LINEARMIPNEAREST:
|
case D3DFILTER_LINEARMIPNEAREST:
|
||||||
|
|
|
@ -415,7 +415,7 @@ void basetexture_apply_state_changes(IWineD3DBaseTexture *iface,
|
||||||
states[WINED3DTEXSTA_MIPFILTER]);
|
states[WINED3DTEXSTA_MIPFILTER]);
|
||||||
}
|
}
|
||||||
glValue = wined3d_gl_min_mip_filter(This->baseTexture.minMipLookup,
|
glValue = wined3d_gl_min_mip_filter(This->baseTexture.minMipLookup,
|
||||||
min(max(samplerStates[WINED3DSAMP_MINFILTER], WINED3DTEXF_NONE), WINED3DTEXF_LINEAR),
|
min(max(samplerStates[WINED3DSAMP_MINFILTER], WINED3DTEXF_POINT), WINED3DTEXF_LINEAR),
|
||||||
min(max(samplerStates[WINED3DSAMP_MIPFILTER], WINED3DTEXF_NONE), WINED3DTEXF_LINEAR));
|
min(max(samplerStates[WINED3DSAMP_MIPFILTER], WINED3DTEXF_NONE), WINED3DTEXF_LINEAR));
|
||||||
|
|
||||||
TRACE("ValueMIN=%d, ValueMIP=%d, setting MINFILTER to %x\n",
|
TRACE("ValueMIN=%d, ValueMIP=%d, setting MINFILTER to %x\n",
|
||||||
|
|
|
@ -6198,7 +6198,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_ColorFill(IWineD3DDevice *iface, IWineD
|
||||||
BltFx.dwSize = sizeof(BltFx);
|
BltFx.dwSize = sizeof(BltFx);
|
||||||
BltFx.u5.dwFillColor = argb_to_fmt(color, surface->resource.format_desc->format);
|
BltFx.u5.dwFillColor = argb_to_fmt(color, surface->resource.format_desc->format);
|
||||||
return IWineD3DSurface_Blt(pSurface, (const RECT *)pRect, NULL, NULL,
|
return IWineD3DSurface_Blt(pSurface, (const RECT *)pRect, NULL, NULL,
|
||||||
WINEDDBLT_COLORFILL, &BltFx, WINED3DTEXF_NONE);
|
WINEDDBLT_COLORFILL, &BltFx, WINED3DTEXF_POINT);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -6245,7 +6245,7 @@ static void WINAPI IWineD3DDeviceImpl_ClearRendertargetView(IWineD3DDevice *ifac
|
||||||
memset(&BltFx, 0, sizeof(BltFx));
|
memset(&BltFx, 0, sizeof(BltFx));
|
||||||
BltFx.dwSize = sizeof(BltFx);
|
BltFx.dwSize = sizeof(BltFx);
|
||||||
BltFx.u5.dwFillColor = argb_to_fmt(c, ((IWineD3DSurfaceImpl *)surface)->resource.format_desc->format);
|
BltFx.u5.dwFillColor = argb_to_fmt(c, ((IWineD3DSurfaceImpl *)surface)->resource.format_desc->format);
|
||||||
hr = IWineD3DSurface_Blt(surface, NULL, NULL, NULL, WINEDDBLT_COLORFILL, &BltFx, WINED3DTEXF_NONE);
|
hr = IWineD3DSurface_Blt(surface, NULL, NULL, NULL, WINEDDBLT_COLORFILL, &BltFx, WINED3DTEXF_POINT);
|
||||||
if (FAILED(hr))
|
if (FAILED(hr))
|
||||||
{
|
{
|
||||||
ERR("Blt failed, hr %#x\n", hr);
|
ERR("Blt failed, hr %#x\n", hr);
|
||||||
|
|
|
@ -132,7 +132,8 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CO
|
||||||
if (This->presentParms.Windowed) {
|
if (This->presentParms.Windowed) {
|
||||||
MapWindowPoints(NULL, This->win_handle, (LPPOINT)&destRect, 2);
|
MapWindowPoints(NULL, This->win_handle, (LPPOINT)&destRect, 2);
|
||||||
}
|
}
|
||||||
IWineD3DSurface_Blt(This->backBuffer[0], &destRect, (IWineD3DSurface *) &cursor, NULL, WINEDDBLT_KEYSRC, NULL, WINED3DTEXF_NONE);
|
IWineD3DSurface_Blt(This->backBuffer[0], &destRect, (IWineD3DSurface *)&cursor,
|
||||||
|
NULL, WINEDDBLT_KEYSRC, NULL, WINED3DTEXF_POINT);
|
||||||
}
|
}
|
||||||
if(This->wineD3DDevice->logo_surface) {
|
if(This->wineD3DDevice->logo_surface) {
|
||||||
/* Blit the logo into the upper left corner of the drawable */
|
/* Blit the logo into the upper left corner of the drawable */
|
||||||
|
|
Loading…
Reference in New Issue