Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
7165bd19
Commit
7165bd19
authored
Aug 05, 2009
by
Henri Verbeet
Committed by
Alexandre Julliard
Aug 05, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: WINED3DTEXF_NONE only makes sense as a mip filter.
parent
9e8f7898
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
8 deletions
+9
-8
device.c
dlls/ddraw/device.c
+4
-4
basetexture.c
dlls/wined3d/basetexture.c
+1
-1
device.c
dlls/wined3d/device.c
+2
-2
swapchain.c
dlls/wined3d/swapchain.c
+2
-1
No files found.
dlls/ddraw/device.c
View file @
7165bd19
...
...
@@ -2639,7 +2639,7 @@ IDirect3DDeviceImpl_7_SetRenderState(IDirect3DDevice7 *iface,
{
case
D3DRENDERSTATE_TEXTUREMAG
:
{
WINED3DTEXTUREFILTERTYPE
tex_mag
=
WINED3DTEXF_
NONE
;
WINED3DTEXTUREFILTERTYPE
tex_mag
=
WINED3DTEXF_
POINT
;
switch
((
D3DTEXTUREFILTER
)
Value
)
{
...
...
@@ -2663,7 +2663,7 @@ IDirect3DDeviceImpl_7_SetRenderState(IDirect3DDevice7 *iface,
case
D3DRENDERSTATE_TEXTUREMIN
:
{
WINED3DTEXTUREFILTERTYPE
tex_min
=
WINED3DTEXF_
NONE
;
WINED3DTEXTUREFILTERTYPE
tex_min
=
WINED3DTEXF_
POINT
;
WINED3DTEXTUREFILTERTYPE
tex_mip
=
WINED3DTEXF_NONE
;
switch
((
D3DTEXTUREFILTER
)
Value
)
...
...
@@ -2675,11 +2675,11 @@ IDirect3DDeviceImpl_7_SetRenderState(IDirect3DDevice7 *iface,
tex_min
=
WINED3DTEXF_LINEAR
;
break
;
case
D3DFILTER_MIPNEAREST
:
tex_min
=
WINED3DTEXF_
NONE
;
tex_min
=
WINED3DTEXF_
POINT
;
tex_mip
=
WINED3DTEXF_POINT
;
break
;
case
D3DFILTER_MIPLINEAR
:
tex_min
=
WINED3DTEXF_
NONE
;
tex_min
=
WINED3DTEXF_
POINT
;
tex_mip
=
WINED3DTEXF_LINEAR
;
break
;
case
D3DFILTER_LINEARMIPNEAREST
:
...
...
dlls/wined3d/basetexture.c
View file @
7165bd19
...
...
@@ -415,7 +415,7 @@ void basetexture_apply_state_changes(IWineD3DBaseTexture *iface,
states
[
WINED3DTEXSTA_MIPFILTER
]);
}
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
));
TRACE
(
"ValueMIN=%d, ValueMIP=%d, setting MINFILTER to %x
\n
"
,
...
...
dlls/wined3d/device.c
View file @
7165bd19
...
...
@@ -6198,7 +6198,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_ColorFill(IWineD3DDevice *iface, IWineD
BltFx
.
dwSize
=
sizeof
(
BltFx
);
BltFx
.
u5
.
dwFillColor
=
argb_to_fmt
(
color
,
surface
->
resource
.
format_desc
->
format
);
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
));
BltFx
.
dwSize
=
sizeof
(
BltFx
);
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
))
{
ERR
(
"Blt failed, hr %#x
\n
"
,
hr
);
...
...
dlls/wined3d/swapchain.c
View file @
7165bd19
...
...
@@ -132,7 +132,8 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CO
if
(
This
->
presentParms
.
Windowed
)
{
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
)
{
/* Blit the logo into the upper left corner of the drawable */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment