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
b4b295c2
Commit
b4b295c2
authored
Mar 24, 2006
by
Stefan Dösinger
Committed by
Alexandre Julliard
Mar 27, 2006
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Add WINED3DMULTISAMPLE_TYPE to wined3d_types.h.
parent
0f7eb527
Show whitespace changes
Inline
Side-by-side
Showing
18 changed files
with
54 additions
and
32 deletions
+54
-32
cubetexture.c
dlls/d3d8/cubetexture.c
+1
-1
d3d8_private.h
dlls/d3d8/d3d8_private.h
+2
-2
device.c
dlls/d3d8/device.c
+2
-2
directx.c
dlls/d3d8/directx.c
+4
-4
surface.c
dlls/d3d8/surface.c
+1
-1
texture.c
dlls/d3d8/texture.c
+1
-1
cubetexture.c
dlls/d3d9/cubetexture.c
+1
-1
d3d9_private.h
dlls/d3d9/d3d9_private.h
+2
-2
device.c
dlls/d3d9/device.c
+1
-1
directx.c
dlls/d3d9/directx.c
+3
-3
surface.c
dlls/d3d9/surface.c
+1
-1
swapchain.c
dlls/d3d9/swapchain.c
+2
-2
texture.c
dlls/d3d9/texture.c
+1
-1
device.c
dlls/wined3d/device.c
+1
-1
directx.c
dlls/wined3d/directx.c
+2
-2
wined3d_private.h
dlls/wined3d/wined3d_private.h
+1
-1
wined3d_interface.h
include/wine/wined3d_interface.h
+4
-4
wined3d_types.h
include/wine/wined3d_types.h
+24
-2
No files found.
dlls/d3d8/cubetexture.c
View file @
b4b295c2
...
...
@@ -144,7 +144,7 @@ HRESULT WINAPI IDirect3DCubeTexture8Impl_GetLevelDesc(LPDIRECT3DCUBETEXTURE8 ifa
wined3ddesc
.
Usage
=
&
pDesc
->
Usage
;
wined3ddesc
.
Pool
=
&
pDesc
->
Pool
;
wined3ddesc
.
Size
=
&
tmpInt
;
wined3ddesc
.
MultiSampleType
=
&
pDesc
->
MultiSampleType
;
wined3ddesc
.
MultiSampleType
=
(
WINED3DMULTISAMPLE_TYPE
*
)
&
pDesc
->
MultiSampleType
;
wined3ddesc
.
MultiSampleQuality
=
NULL
;
/* DirectX9 only */
wined3ddesc
.
Width
=
&
pDesc
->
Width
;
wined3ddesc
.
Height
=
&
pDesc
->
Height
;
...
...
dlls/d3d8/d3d8_private.h
View file @
b4b295c2
...
...
@@ -569,12 +569,12 @@ extern HRESULT WINAPI D3D8CB_CreateVolume(IUnknown *pDevice, UINT Width, UINT H
HANDLE
*
pSharedHandle
);
extern
HRESULT
WINAPI
D3D8CB_CreateDepthStencilSurface
(
IUnknown
*
device
,
UINT
Width
,
UINT
Height
,
WINED3DFORMAT
Format
,
D3DMULTISAMPLE_TYPE
MultiSample
,
WINED3DFORMAT
Format
,
WINE
D3DMULTISAMPLE_TYPE
MultiSample
,
DWORD
MultisampleQuality
,
BOOL
Discard
,
IWineD3DSurface
**
ppSurface
,
HANDLE
*
pSharedHandle
);
extern
HRESULT
WINAPI
D3D8CB_CreateRenderTarget
(
IUnknown
*
device
,
UINT
Width
,
UINT
Height
,
WINED3DFORMAT
Format
,
D3DMULTISAMPLE_TYPE
MultiSample
,
WINED3DFORMAT
Format
,
WINE
D3DMULTISAMPLE_TYPE
MultiSample
,
DWORD
MultisampleQuality
,
BOOL
Lockable
,
IWineD3DSurface
**
ppSurface
,
HANDLE
*
pSharedHandle
);
...
...
dlls/d3d8/device.c
View file @
b4b295c2
...
...
@@ -195,7 +195,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_CreateAdditionalSwapChain(LPDIRECT3DDEVICE8
localParameters
.
BackBufferHeight
=
&
pPresentationParameters
->
BackBufferHeight
;
localParameters
.
BackBufferFormat
=
(
WINED3DFORMAT
*
)
&
pPresentationParameters
->
BackBufferFormat
;
localParameters
.
BackBufferCount
=
&
pPresentationParameters
->
BackBufferCount
;
localParameters
.
MultiSampleType
=
&
pPresentationParameters
->
MultiSampleType
;
localParameters
.
MultiSampleType
=
(
WINED3DMULTISAMPLE_TYPE
*
)
&
pPresentationParameters
->
MultiSampleType
;
localParameters
.
MultiSampleQuality
=
NULL
;
/* d3d9 only */
localParameters
.
SwapEffect
=
&
pPresentationParameters
->
SwapEffect
;
localParameters
.
hDeviceWindow
=
&
pPresentationParameters
->
hDeviceWindow
;
...
...
@@ -228,7 +228,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_Reset(LPDIRECT3DDEVICE8 iface, D3DPRESENT_PA
localParameters
.
BackBufferHeight
=
&
pPresentationParameters
->
BackBufferHeight
;
localParameters
.
BackBufferFormat
=
(
WINED3DFORMAT
*
)
&
pPresentationParameters
->
BackBufferFormat
;
localParameters
.
BackBufferCount
=
&
pPresentationParameters
->
BackBufferCount
;
localParameters
.
MultiSampleType
=
&
pPresentationParameters
->
MultiSampleType
;
localParameters
.
MultiSampleType
=
(
WINED3DMULTISAMPLE_TYPE
*
)
&
pPresentationParameters
->
MultiSampleType
;
localParameters
.
MultiSampleQuality
=
NULL
;
/* D3d9 only */
localParameters
.
SwapEffect
=
&
pPresentationParameters
->
SwapEffect
;
localParameters
.
hDeviceWindow
=
&
pPresentationParameters
->
hDeviceWindow
;
...
...
dlls/d3d8/directx.c
View file @
b4b295c2
...
...
@@ -147,7 +147,7 @@ HRESULT WINAPI IDirect3D8Impl_CheckDeviceMultiSampleType(LPDIRECT3D8 iface,
BOOL
Windowed
,
D3DMULTISAMPLE_TYPE
MultiSampleType
)
{
IDirect3D8Impl
*
This
=
(
IDirect3D8Impl
*
)
iface
;
return
IWineD3D_CheckDeviceMultiSampleType
(
This
->
WineD3D
,
Adapter
,
DeviceType
,
SurfaceFormat
,
Windowed
,
MultiSampleType
,
NULL
);
Windowed
,
(
WINED3DMULTISAMPLE_TYPE
)
MultiSampleType
,
NULL
);
}
HRESULT
WINAPI
IDirect3D8Impl_CheckDepthStencilMatch
(
LPDIRECT3D8
iface
,
...
...
@@ -186,7 +186,7 @@ HMONITOR WINAPI IDirect3D8Impl_GetAdapterMonitor(LPDIRECT3D8 iface, UINT Adapte
/* Internal function called back during the CreateDevice to create a render target */
HRESULT
WINAPI
D3D8CB_CreateRenderTarget
(
IUnknown
*
device
,
UINT
Width
,
UINT
Height
,
WINED3DFORMAT
Format
,
D3DMULTISAMPLE_TYPE
MultiSample
,
WINED3DFORMAT
Format
,
WINE
D3DMULTISAMPLE_TYPE
MultiSample
,
DWORD
MultisampleQuality
,
BOOL
Lockable
,
IWineD3DSurface
**
ppSurface
,
HANDLE
*
pSharedHandle
)
{
HRESULT
res
=
D3D_OK
;
...
...
@@ -263,7 +263,7 @@ HRESULT WINAPI D3D8CB_CreateAdditionalSwapChain(IUnknown *device,
/* Internal function called back during the CreateDevice to create a render target */
HRESULT
WINAPI
D3D8CB_CreateDepthStencilSurface
(
IUnknown
*
device
,
UINT
Width
,
UINT
Height
,
WINED3DFORMAT
Format
,
D3DMULTISAMPLE_TYPE
MultiSample
,
WINED3DFORMAT
Format
,
WINE
D3DMULTISAMPLE_TYPE
MultiSample
,
DWORD
MultisampleQuality
,
BOOL
Discard
,
IWineD3DSurface
**
ppSurface
,
HANDLE
*
pSharedHandle
)
{
HRESULT
res
=
D3D_OK
;
...
...
@@ -311,7 +311,7 @@ HRESULT WINAPI IDirect3D8Impl_CreateDevice(LPDIRECT3D8 iface, UINT Adapter, D3
localParameters
.
BackBufferHeight
=
&
pPresentationParameters
->
BackBufferHeight
;
localParameters
.
BackBufferFormat
=
(
WINED3DFORMAT
*
)
&
pPresentationParameters
->
BackBufferFormat
;
localParameters
.
BackBufferCount
=
&
pPresentationParameters
->
BackBufferCount
;
localParameters
.
MultiSampleType
=
&
pPresentationParameters
->
MultiSampleType
;
localParameters
.
MultiSampleType
=
(
WINED3DMULTISAMPLE_TYPE
*
)
&
pPresentationParameters
->
MultiSampleType
;
/* d3d9 only */
localParameters
.
MultiSampleQuality
=
NULL
;
localParameters
.
SwapEffect
=
&
pPresentationParameters
->
SwapEffect
;
...
...
dlls/d3d8/surface.c
View file @
b4b295c2
...
...
@@ -166,7 +166,7 @@ HRESULT WINAPI IDirect3DSurface8Impl_GetDesc(LPDIRECT3DSURFACE8 iface, D3DSURFAC
wined3ddesc
.
Usage
=
&
pDesc
->
Usage
;
wined3ddesc
.
Pool
=
&
pDesc
->
Pool
;
wined3ddesc
.
Size
=
&
tmpInt
;
wined3ddesc
.
MultiSampleType
=
&
pDesc
->
MultiSampleType
;
wined3ddesc
.
MultiSampleType
=
(
WINED3DMULTISAMPLE_TYPE
*
)
&
pDesc
->
MultiSampleType
;
wined3ddesc
.
Width
=
&
pDesc
->
Width
;
wined3ddesc
.
Height
=
&
pDesc
->
Height
;
...
...
dlls/d3d8/texture.c
View file @
b4b295c2
...
...
@@ -145,7 +145,7 @@ HRESULT WINAPI IDirect3DTexture8Impl_GetLevelDesc(LPDIRECT3DTEXTURE8 iface, UINT
wined3ddesc
.
Usage
=
&
pDesc
->
Usage
;
wined3ddesc
.
Pool
=
&
pDesc
->
Pool
;
wined3ddesc
.
Size
=
&
tmpInt
;
/* required for d3d8 */
wined3ddesc
.
MultiSampleType
=
&
pDesc
->
MultiSampleType
;
wined3ddesc
.
MultiSampleType
=
(
WINED3DMULTISAMPLE_TYPE
*
)
&
pDesc
->
MultiSampleType
;
wined3ddesc
.
Width
=
&
pDesc
->
Width
;
wined3ddesc
.
Height
=
&
pDesc
->
Height
;
...
...
dlls/d3d9/cubetexture.c
View file @
b4b295c2
...
...
@@ -165,7 +165,7 @@ HRESULT WINAPI IDirect3DCubeTexture9Impl_GetLevelDesc(LPDIRECT3DCUBETEXTURE9 ifa
wined3ddesc
.
Usage
=
&
pDesc
->
Usage
;
wined3ddesc
.
Pool
=
&
pDesc
->
Pool
;
wined3ddesc
.
Size
=
&
tmpInt
;
wined3ddesc
.
MultiSampleType
=
&
pDesc
->
MultiSampleType
;
wined3ddesc
.
MultiSampleType
=
(
WINED3DMULTISAMPLE_TYPE
*
)
&
pDesc
->
MultiSampleType
;
wined3ddesc
.
MultiSampleQuality
=
&
pDesc
->
MultiSampleQuality
;
wined3ddesc
.
Width
=
&
pDesc
->
Width
;
wined3ddesc
.
Height
=
&
pDesc
->
Height
;
...
...
dlls/d3d9/d3d9_private.h
View file @
b4b295c2
...
...
@@ -618,12 +618,12 @@ extern HRESULT WINAPI D3D9CB_CreateVolume(IUnknown *pDevice, UINT Width, UINT H
HANDLE
*
pSharedHandle
);
extern
HRESULT
WINAPI
D3D9CB_CreateDepthStencilSurface
(
IUnknown
*
device
,
UINT
Width
,
UINT
Height
,
WINED3DFORMAT
Format
,
D3DMULTISAMPLE_TYPE
MultiSample
,
WINED3DFORMAT
Format
,
WINE
D3DMULTISAMPLE_TYPE
MultiSample
,
DWORD
MultisampleQuality
,
BOOL
Discard
,
IWineD3DSurface
**
ppSurface
,
HANDLE
*
pSharedHandle
);
extern
HRESULT
WINAPI
D3D9CB_CreateRenderTarget
(
IUnknown
*
device
,
UINT
Width
,
UINT
Height
,
WINED3DFORMAT
Format
,
D3DMULTISAMPLE_TYPE
MultiSample
,
WINED3DFORMAT
Format
,
WINE
D3DMULTISAMPLE_TYPE
MultiSample
,
DWORD
MultisampleQuality
,
BOOL
Lockable
,
IWineD3DSurface
**
ppSurface
,
HANDLE
*
pSharedHandle
);
...
...
dlls/d3d9/device.c
View file @
b4b295c2
...
...
@@ -170,7 +170,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_Reset(LPDIRECT3DDEVICE9 iface, D3DPRESENT_
localParameters
.
BackBufferHeight
=
&
pPresentationParameters
->
BackBufferHeight
;
localParameters
.
BackBufferFormat
=
(
WINED3DFORMAT
*
)
&
pPresentationParameters
->
BackBufferFormat
;
localParameters
.
BackBufferCount
=
&
pPresentationParameters
->
BackBufferCount
;
localParameters
.
MultiSampleType
=
&
pPresentationParameters
->
MultiSampleType
;
localParameters
.
MultiSampleType
=
(
WINED3DMULTISAMPLE_TYPE
*
)
&
pPresentationParameters
->
MultiSampleType
;
localParameters
.
MultiSampleQuality
=
&
pPresentationParameters
->
MultiSampleQuality
;
localParameters
.
SwapEffect
=
&
pPresentationParameters
->
SwapEffect
;
localParameters
.
hDeviceWindow
=
&
pPresentationParameters
->
hDeviceWindow
;
...
...
dlls/d3d9/directx.c
View file @
b4b295c2
...
...
@@ -176,7 +176,7 @@ HMONITOR WINAPI IDirect3D9Impl_GetAdapterMonitor(LPDIRECT3D9 iface, UINT Adapte
/* Internal function called back during the CreateDevice to create a render target */
HRESULT
WINAPI
D3D9CB_CreateRenderTarget
(
IUnknown
*
device
,
UINT
Width
,
UINT
Height
,
WINED3DFORMAT
Format
,
D3DMULTISAMPLE_TYPE
MultiSample
,
WINED3DFORMAT
Format
,
WINE
D3DMULTISAMPLE_TYPE
MultiSample
,
DWORD
MultisampleQuality
,
BOOL
Lockable
,
IWineD3DSurface
**
ppSurface
,
HANDLE
*
pSharedHandle
)
{
HRESULT
res
=
D3D_OK
;
...
...
@@ -246,7 +246,7 @@ HRESULT WINAPI D3D9CB_CreateAdditionalSwapChain(IUnknown *device,
/* Internal function called back during the CreateDevice to create a render target */
HRESULT
WINAPI
D3D9CB_CreateDepthStencilSurface
(
IUnknown
*
device
,
UINT
Width
,
UINT
Height
,
WINED3DFORMAT
Format
,
D3DMULTISAMPLE_TYPE
MultiSample
,
WINED3DFORMAT
Format
,
WINE
D3DMULTISAMPLE_TYPE
MultiSample
,
DWORD
MultisampleQuality
,
BOOL
Discard
,
IWineD3DSurface
**
ppSurface
,
HANDLE
*
pSharedHandle
)
{
HRESULT
res
=
D3D_OK
;
...
...
@@ -296,7 +296,7 @@ HRESULT WINAPI IDirect3D9Impl_CreateDevice(LPDIRECT3D9 iface, UINT Adapter, D3
localParameters
.
BackBufferHeight
=
&
pPresentationParameters
->
BackBufferHeight
;
localParameters
.
BackBufferFormat
=
(
WINED3DFORMAT
*
)
&
pPresentationParameters
->
BackBufferFormat
;
localParameters
.
BackBufferCount
=
&
pPresentationParameters
->
BackBufferCount
;
localParameters
.
MultiSampleType
=
&
pPresentationParameters
->
MultiSampleType
;
localParameters
.
MultiSampleType
=
(
WINED3DMULTISAMPLE_TYPE
*
)
&
pPresentationParameters
->
MultiSampleType
;
localParameters
.
MultiSampleQuality
=
&
pPresentationParameters
->
MultiSampleQuality
;
localParameters
.
SwapEffect
=
&
pPresentationParameters
->
SwapEffect
;
localParameters
.
hDeviceWindow
=
&
pPresentationParameters
->
hDeviceWindow
;
...
...
dlls/d3d9/surface.c
View file @
b4b295c2
...
...
@@ -185,7 +185,7 @@ HRESULT WINAPI IDirect3DSurface9Impl_GetDesc(LPDIRECT3DSURFACE9 iface, D3DSURFAC
wined3ddesc
.
Usage
=
&
pDesc
->
Usage
;
wined3ddesc
.
Pool
=
&
pDesc
->
Pool
;
wined3ddesc
.
Size
=
&
tmpInt
;
wined3ddesc
.
MultiSampleType
=
&
pDesc
->
MultiSampleType
;
wined3ddesc
.
MultiSampleType
=
(
WINED3DMULTISAMPLE_TYPE
*
)
&
pDesc
->
MultiSampleType
;
wined3ddesc
.
MultiSampleQuality
=
&
pDesc
->
MultiSampleQuality
;
wined3ddesc
.
Width
=
&
pDesc
->
Width
;
wined3ddesc
.
Height
=
&
pDesc
->
Height
;
...
...
dlls/d3d9/swapchain.c
View file @
b4b295c2
...
...
@@ -126,7 +126,7 @@ HRESULT WINAPI IDirect3DSwapChain9Impl_GetPresentParameters(LPDIRECT3DSWAPCHAIN9
winePresentParameters
.
BackBufferHeight
=
&
pPresentationParameters
->
BackBufferHeight
;
winePresentParameters
.
BackBufferFormat
=
(
WINED3DFORMAT
*
)
&
pPresentationParameters
->
BackBufferFormat
;
winePresentParameters
.
BackBufferCount
=
&
pPresentationParameters
->
BackBufferCount
;
winePresentParameters
.
MultiSampleType
=
&
pPresentationParameters
->
MultiSampleType
;
winePresentParameters
.
MultiSampleType
=
(
WINED3DMULTISAMPLE_TYPE
*
)
&
pPresentationParameters
->
MultiSampleType
;
winePresentParameters
.
MultiSampleQuality
=
&
pPresentationParameters
->
MultiSampleQuality
;
winePresentParameters
.
SwapEffect
=
&
pPresentationParameters
->
SwapEffect
;
winePresentParameters
.
hDeviceWindow
=
&
pPresentationParameters
->
hDeviceWindow
;
...
...
@@ -176,7 +176,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_CreateAdditionalSwapChain(LPDIRECT3DDEVICE
localParameters
.
BackBufferHeight
=
&
pPresentationParameters
->
BackBufferHeight
;
localParameters
.
BackBufferFormat
=
(
WINED3DFORMAT
*
)
&
pPresentationParameters
->
BackBufferFormat
;
localParameters
.
BackBufferCount
=
&
pPresentationParameters
->
BackBufferCount
;
localParameters
.
MultiSampleType
=
&
pPresentationParameters
->
MultiSampleType
;
localParameters
.
MultiSampleType
=
(
WINED3DMULTISAMPLE_TYPE
*
)
&
pPresentationParameters
->
MultiSampleType
;
localParameters
.
MultiSampleQuality
=
&
pPresentationParameters
->
MultiSampleQuality
;
localParameters
.
SwapEffect
=
&
pPresentationParameters
->
SwapEffect
;
localParameters
.
hDeviceWindow
=
&
pPresentationParameters
->
hDeviceWindow
;
...
...
dlls/d3d9/texture.c
View file @
b4b295c2
...
...
@@ -164,7 +164,7 @@ HRESULT WINAPI IDirect3DTexture9Impl_GetLevelDesc(LPDIRECT3DTEXTURE9 iface, UINT
wined3ddesc
.
Usage
=
&
pDesc
->
Usage
;
wined3ddesc
.
Pool
=
&
pDesc
->
Pool
;
wined3ddesc
.
Size
=
&
tmpInt
;
/* required for d3d8 */
wined3ddesc
.
MultiSampleType
=
&
pDesc
->
MultiSampleType
;
wined3ddesc
.
MultiSampleType
=
(
WINED3DMULTISAMPLE_TYPE
*
)
&
pDesc
->
MultiSampleType
;
wined3ddesc
.
MultiSampleQuality
=
&
pDesc
->
MultiSampleQuality
;
wined3ddesc
.
Width
=
&
pDesc
->
Width
;
wined3ddesc
.
Height
=
&
pDesc
->
Height
;
...
...
dlls/wined3d/device.c
View file @
b4b295c2
...
...
@@ -636,7 +636,7 @@ If this flag is set, the contents of the depth stencil buffer will be invalid af
******************************** */
HRESULT
WINAPI
IWineD3DDeviceImpl_CreateSurface
(
IWineD3DDevice
*
iface
,
UINT
Width
,
UINT
Height
,
WINED3DFORMAT
Format
,
BOOL
Lockable
,
BOOL
Discard
,
UINT
Level
,
IWineD3DSurface
**
ppSurface
,
WINED3DRESOURCETYPE
Type
,
DWORD
Usage
,
D3DPOOL
Pool
,
D3DMULTISAMPLE_TYPE
MultiSample
,
DWORD
MultisampleQuality
,
HANDLE
*
pSharedHandle
,
IUnknown
*
parent
)
{
HRESULT
WINAPI
IWineD3DDeviceImpl_CreateSurface
(
IWineD3DDevice
*
iface
,
UINT
Width
,
UINT
Height
,
WINED3DFORMAT
Format
,
BOOL
Lockable
,
BOOL
Discard
,
UINT
Level
,
IWineD3DSurface
**
ppSurface
,
WINED3DRESOURCETYPE
Type
,
DWORD
Usage
,
D3DPOOL
Pool
,
WINE
D3DMULTISAMPLE_TYPE
MultiSample
,
DWORD
MultisampleQuality
,
HANDLE
*
pSharedHandle
,
IUnknown
*
parent
)
{
IWineD3DDeviceImpl
*
This
=
(
IWineD3DDeviceImpl
*
)
iface
;
IWineD3DSurfaceImpl
*
object
;
/*NOTE: impl ref allowed since this is a create function */
unsigned
int
pow2Width
,
pow2Height
;
...
...
dlls/wined3d/directx.c
View file @
b4b295c2
...
...
@@ -1256,7 +1256,7 @@ HRESULT WINAPI IWineD3DImpl_CheckDepthStencilMatch(IWineD3D *iface, UINT Adapter
HRESULT
WINAPI
IWineD3DImpl_CheckDeviceMultiSampleType
(
IWineD3D
*
iface
,
UINT
Adapter
,
D3DDEVTYPE
DeviceType
,
WINED3DFORMAT
SurfaceFormat
,
BOOL
Windowed
,
D3DMULTISAMPLE_TYPE
MultiSampleType
,
DWORD
*
pQualityLevels
)
{
BOOL
Windowed
,
WINE
D3DMULTISAMPLE_TYPE
MultiSampleType
,
DWORD
*
pQualityLevels
)
{
IWineD3DImpl
*
This
=
(
IWineD3DImpl
*
)
iface
;
TRACE_
(
d3d_caps
)(
"(%p)-> (STUB) (Adptr:%d, DevType:(%x,%s), SurfFmt:(%x,%s), Win?%d, MultiSamp:%x, pQual:%p)
\n
"
,
...
...
@@ -1281,7 +1281,7 @@ HRESULT WINAPI IWineD3DImpl_CheckDeviceMultiSampleType(IWineD3D *iface, UINT Ada
*
pQualityLevels
=
1
;
/* Guess at a value! */
}
if
(
D3DMULTISAMPLE_NONE
==
MultiSampleType
)
return
D3D_OK
;
if
(
WINE
D3DMULTISAMPLE_NONE
==
MultiSampleType
)
return
D3D_OK
;
return
D3DERR_NOTAVAILABLE
;
}
...
...
dlls/wined3d/wined3d_private.h
View file @
b4b295c2
...
...
@@ -792,7 +792,7 @@ extern const IWineD3DVolumeTextureVtbl IWineD3DVolumeTexture_Vtbl;
typedef
struct
_WINED3DSURFACET_DESC
{
D3DMULTISAMPLE_TYPE
MultiSampleType
;
WINE
D3DMULTISAMPLE_TYPE
MultiSampleType
;
DWORD
MultiSampleQuality
;
UINT
Width
;
UINT
Height
;
...
...
include/wine/wined3d_interface.h
View file @
b4b295c2
...
...
@@ -164,7 +164,7 @@ typedef HRESULT WINAPI (*D3DCB_CREATERENDERTARGETFN) (IUnknown *pDevice,
UINT
Width
,
UINT
Height
,
WINED3DFORMAT
Format
,
D3DMULTISAMPLE_TYPE
MultiSample
,
WINE
D3DMULTISAMPLE_TYPE
MultiSample
,
DWORD
MultisampleQuality
,
BOOL
Lockable
,
struct
IWineD3DSurface
**
ppSurface
,
...
...
@@ -184,7 +184,7 @@ typedef HRESULT WINAPI (*D3DCB_CREATEDEPTHSTENCILSURFACEFN) (IUnknown *pDevice,
UINT
Width
,
UINT
Height
,
WINED3DFORMAT
Format
,
D3DMULTISAMPLE_TYPE
MultiSample
,
WINE
D3DMULTISAMPLE_TYPE
MultiSample
,
DWORD
MultisampleQuality
,
BOOL
Discard
,
struct
IWineD3DSurface
**
ppSurface
,
...
...
@@ -252,7 +252,7 @@ DECLARE_INTERFACE_(IWineD3D, IWineD3DBase)
STDMETHOD
(
EnumAdapterModes
)(
THIS_
UINT
Adapter
,
UINT
Mode
,
WINED3DFORMAT
Format
,
D3DDISPLAYMODE
*
pMode
)
PURE
;
STDMETHOD
(
GetAdapterDisplayMode
)(
THIS_
UINT
Adapter
,
D3DDISPLAYMODE
*
pMode
)
PURE
;
STDMETHOD
(
GetAdapterIdentifier
)(
THIS_
UINT
Adapter
,
DWORD
Flags
,
WINED3DADAPTER_IDENTIFIER
*
pIdentifier
)
PURE
;
STDMETHOD
(
CheckDeviceMultiSampleType
)(
THIS_
UINT
Adapter
,
D3DDEVTYPE
DeviceType
,
WINED3DFORMAT
SurfaceFormat
,
BOOL
Windowed
,
D3DMULTISAMPLE_TYPE
MultiSampleType
,
DWORD
*
pQuality
)
PURE
;
STDMETHOD
(
CheckDeviceMultiSampleType
)(
THIS_
UINT
Adapter
,
D3DDEVTYPE
DeviceType
,
WINED3DFORMAT
SurfaceFormat
,
BOOL
Windowed
,
WINE
D3DMULTISAMPLE_TYPE
MultiSampleType
,
DWORD
*
pQuality
)
PURE
;
STDMETHOD
(
CheckDepthStencilMatch
)(
THIS_
UINT
Adapter
,
D3DDEVTYPE
DeviceType
,
WINED3DFORMAT
AdapterFormat
,
WINED3DFORMAT
RenderTargetFormat
,
WINED3DFORMAT
DepthStencilFormat
)
PURE
;
STDMETHOD
(
CheckDeviceType
)(
THIS_
UINT
Adapter
,
D3DDEVTYPE
CheckType
,
WINED3DFORMAT
DisplayFormat
,
WINED3DFORMAT
BackBufferFormat
,
BOOL
Windowed
)
PURE
;
STDMETHOD
(
CheckDeviceFormat
)(
THIS_
UINT
Adapter
,
D3DDEVTYPE
DeviceType
,
WINED3DFORMAT
AdapterFormat
,
DWORD
Usage
,
WINED3DRESOURCETYPE
RType
,
WINED3DFORMAT
CheckFormat
)
PURE
;
...
...
@@ -306,7 +306,7 @@ DECLARE_INTERFACE_(IWineD3DDevice,IWineD3DBase)
STDMETHOD
(
CreateVertexBuffer
)(
THIS_
UINT
Length
,
DWORD
Usage
,
DWORD
FVF
,
D3DPOOL
Pool
,
struct
IWineD3DVertexBuffer
**
ppVertexBuffer
,
HANDLE
*
sharedHandle
,
IUnknown
*
parent
)
PURE
;
STDMETHOD
(
CreateIndexBuffer
)(
THIS_
UINT
Length
,
DWORD
Usage
,
WINED3DFORMAT
Format
,
D3DPOOL
Pool
,
struct
IWineD3DIndexBuffer
**
ppIndexBuffer
,
HANDLE
*
pSharedHandle
,
IUnknown
*
parent
)
PURE
;
STDMETHOD
(
CreateStateBlock
)(
THIS_
WINED3DSTATEBLOCKTYPE
Type
,
struct
IWineD3DStateBlock
**
ppStateBlock
,
IUnknown
*
parent
)
PURE
;
STDMETHOD
(
CreateSurface
)(
THIS_
UINT
Width
,
UINT
Height
,
WINED3DFORMAT
Format
,
BOOL
Lockable
,
BOOL
Discard
,
UINT
Level
,
struct
IWineD3DSurface
**
ppSurface
,
WINED3DRESOURCETYPE
Type
,
DWORD
Usage
,
D3DPOOL
Pool
,
D3DMULTISAMPLE_TYPE
MultiSample
,
DWORD
MultisampleQuality
,
HANDLE
*
pSharedHandle
,
IUnknown
*
parent
)
PURE
;
STDMETHOD
(
CreateSurface
)(
THIS_
UINT
Width
,
UINT
Height
,
WINED3DFORMAT
Format
,
BOOL
Lockable
,
BOOL
Discard
,
UINT
Level
,
struct
IWineD3DSurface
**
ppSurface
,
WINED3DRESOURCETYPE
Type
,
DWORD
Usage
,
D3DPOOL
Pool
,
WINE
D3DMULTISAMPLE_TYPE
MultiSample
,
DWORD
MultisampleQuality
,
HANDLE
*
pSharedHandle
,
IUnknown
*
parent
)
PURE
;
STDMETHOD
(
CreateTexture
)(
THIS_
UINT
Width
,
UINT
Height
,
UINT
Levels
,
DWORD
Usage
,
WINED3DFORMAT
Format
,
D3DPOOL
Pool
,
struct
IWineD3DTexture
**
ppTexture
,
HANDLE
*
pSharedHandle
,
IUnknown
*
parent
,
D3DCB_CREATESURFACEFN
pFn
)
PURE
;
STDMETHOD
(
CreateVolumeTexture
)(
THIS_
UINT
Width
,
UINT
Height
,
UINT
Depth
,
UINT
Levels
,
DWORD
Usage
,
WINED3DFORMAT
Format
,
D3DPOOL
Pool
,
struct
IWineD3DVolumeTexture
**
ppVolumeTexture
,
HANDLE
*
pSharedHandle
,
IUnknown
*
parent
,
D3DCB_CREATEVOLUMEFN
pFn
)
PURE
;
STDMETHOD
(
CreateVolume
)(
THIS_
UINT
Width
,
UINT
Height
,
UINT
Depth
,
DWORD
Usage
,
WINED3DFORMAT
Format
,
D3DPOOL
Pool
,
struct
IWineD3DVolume
**
ppVolumeTexture
,
HANDLE
*
pSharedHandle
,
IUnknown
*
parent
)
PURE
;
...
...
include/wine/wined3d_types.h
View file @
b4b295c2
...
...
@@ -375,6 +375,28 @@ typedef enum _WINED3DSAMPLERSTATETYPE {
}
WINED3DSAMPLERSTATETYPE
;
#define WINED3D_HIGHEST_SAMPLER_STATE WINED3DSAMP_DMAPOFFSET
typedef
enum
_WINED3DMULTISAMPLE_TYPE
{
WINED3DMULTISAMPLE_NONE
=
0
,
WINED3DMULTISAMPLE_NONMASKABLE
=
1
,
WINED3DMULTISAMPLE_2_SAMPLES
=
2
,
WINED3DMULTISAMPLE_3_SAMPLES
=
3
,
WINED3DMULTISAMPLE_4_SAMPLES
=
4
,
WINED3DMULTISAMPLE_5_SAMPLES
=
5
,
WINED3DMULTISAMPLE_6_SAMPLES
=
6
,
WINED3DMULTISAMPLE_7_SAMPLES
=
7
,
WINED3DMULTISAMPLE_8_SAMPLES
=
8
,
WINED3DMULTISAMPLE_9_SAMPLES
=
9
,
WINED3DMULTISAMPLE_10_SAMPLES
=
10
,
WINED3DMULTISAMPLE_11_SAMPLES
=
11
,
WINED3DMULTISAMPLE_12_SAMPLES
=
12
,
WINED3DMULTISAMPLE_13_SAMPLES
=
13
,
WINED3DMULTISAMPLE_14_SAMPLES
=
14
,
WINED3DMULTISAMPLE_15_SAMPLES
=
15
,
WINED3DMULTISAMPLE_16_SAMPLES
=
16
,
WINED3DMULTISAMPLE_FORCE_DWORD
=
0xffffffff
}
WINED3DMULTISAMPLE_TYPE
;
typedef
enum
_WINED3DTEXTURESTAGESTATETYPE
{
WINED3DTSS_COLOROP
=
1
,
WINED3DTSS_COLORARG1
=
2
,
...
...
@@ -455,7 +477,7 @@ typedef struct _WINED3DPRESENT_PARAMETERS {
UINT
*
BackBufferHeight
;
WINED3DFORMAT
*
BackBufferFormat
;
UINT
*
BackBufferCount
;
D3DMULTISAMPLE_TYPE
*
MultiSampleType
;
WINE
D3DMULTISAMPLE_TYPE
*
MultiSampleType
;
DWORD
*
MultiSampleQuality
;
D3DSWAPEFFECT
*
SwapEffect
;
HWND
*
hDeviceWindow
;
...
...
@@ -489,7 +511,7 @@ typedef struct _WINED3DSURFACE_DESC
D3DPOOL
*
Pool
;
UINT
*
Size
;
D3DMULTISAMPLE_TYPE
*
MultiSampleType
;
WINE
D3DMULTISAMPLE_TYPE
*
MultiSampleType
;
DWORD
*
MultiSampleQuality
;
UINT
*
Width
;
UINT
*
Height
;
...
...
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