marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Add device caps to wined3d_types.h.

oldstable
Stefan Dösinger 2006-03-06 23:05:02 +01:00 committed by Alexandre Julliard
parent 8f897239c4
commit 2f0c781988
4 changed files with 34 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/wined3d/device.c
View File

@ -4661,7 +4661,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetTexture(IWineD3DDevice *iface, DWORD Stage,
if(pTexture != NULL) {
/* SetTexture isn't allowed on textures in D3DPOOL_SCRATCH; The same is
* the case for D3DPOOL_SYSTEMMEM textures unless D3DDEVCAPS_TEXTURESYSTEMMORY is set.
* the case for D3DPOOL_SYSTEMMEM textures unless WINED3DDEVCAPS_TEXTURESYSTEMMORY is set.
* We don't check the caps as GetDeviceCaps is inefficient and we don't set the cap anyway.
*/
if(((IWineD3DTextureImpl*)pTexture)->resource.pool == D3DPOOL_SCRATCH || ((IWineD3DTextureImpl*)pTexture)->resource.pool == D3DPOOL_SYSTEMMEM) {

14
dlls/wined3d/directx.c
View File

@ -1462,18 +1462,18 @@ HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, D3DDEVT
*pCaps->Caps = 0;
*pCaps->Caps2 = D3DCAPS2_CANRENDERWINDOWED;
*pCaps->Caps3 = D3DDEVCAPS_HWTRANSFORMANDLIGHT;
*pCaps->Caps3 = WINED3DDEVCAPS_HWTRANSFORMANDLIGHT;
*pCaps->PresentationIntervals = D3DPRESENT_INTERVAL_IMMEDIATE;
*pCaps->CursorCaps = 0;
*pCaps->DevCaps = D3DDEVCAPS_DRAWPRIMTLVERTEX |
D3DDEVCAPS_HWTRANSFORMANDLIGHT |
D3DDEVCAPS_EXECUTEVIDEOMEMORY |
D3DDEVCAPS_PUREDEVICE |
D3DDEVCAPS_HWRASTERIZATION |
D3DDEVCAPS_TEXTUREVIDEOMEMORY;
*pCaps->DevCaps = WINED3DDEVCAPS_DRAWPRIMTLVERTEX |
WINED3DDEVCAPS_HWTRANSFORMANDLIGHT |
WINED3DDEVCAPS_EXECUTEVIDEOMEMORY |
WINED3DDEVCAPS_PUREDEVICE |
WINED3DDEVCAPS_HWRASTERIZATION |
WINED3DDEVCAPS_TEXTUREVIDEOMEMORY;
*pCaps->PrimitiveMiscCaps = D3DPMISCCAPS_CULLCCW |

2
dlls/wined3d/surface.c
View File

@ -949,7 +949,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_LoadTexture(IWineD3DSurface *iface) {
* these resources cannot be accessed by the Direct3D device nor set as textures or render targets.
* However, these resources can always be created, locked, and copied.
* In general never store scratch or system mem textures in the video ram. However it is allowed
* for system memory textures when D3DDEVCAPS_TEXTURESYSTEMMEMORY is set but it isn't right now.
* for system memory textures when WINED3DDEVCAPS_TEXTURESYSTEMMEMORY is set but it isn't right now.
*/
if (This->resource.pool == D3DPOOL_SCRATCH || This->resource.pool == D3DPOOL_SYSTEMMEM)
{

25
include/wine/wined3d_types.h
View File

@ -869,4 +869,29 @@ typedef enum _WINED3DDECLUSAGE {
#define WINED3DVTXPCAPS_TEXGEN_SPHEREMAP 0x00000100L
#define WINED3DVTXPCAPS_NO_TEXGEN_NONLOCALVIEWER 0x00000200L
#define WINED3DDEVCAPS_FLOATTLVERTEX 0x000000001
#define WINED3DDEVCAPS_SORTINCREASINGZ 0x000000002
#define WINED3DDEVCAPS_SORTDECREASINGZ 0X000000004
#define WINED3DDEVCAPS_SORTEXACT 0x000000008
#define WINED3DDEVCAPS_EXECUTESYSTEMMEMORY 0x000000010
#define WINED3DDEVCAPS_EXECUTEVIDEOMEMORY 0x000000020
#define WINED3DDEVCAPS_TLVERTEXSYSTEMMEMORY 0x000000040
#define WINED3DDEVCAPS_TLVERTEXVIDEOMEMORY 0x000000080
#define WINED3DDEVCAPS_TEXTURESYSTEMMEMORY 0x000000100
#define WINED3DDEVCAPS_TEXTUREVIDEOMEMORY 0x000000200
#define WINED3DDEVCAPS_DRAWPRIMTLVERTEX 0x000000400
#define WINED3DDEVCAPS_CANRENDERAFTERFLIP 0x000000800
#define WINED3DDEVCAPS_TEXTURENONLOCALVIDMEM 0x000001000
#define WINED3DDEVCAPS_DRAWPRIMITIVES2 0x000002000
#define WINED3DDEVCAPS_SEPARATETEXTUREMEMORIES 0x000004000
#define WINED3DDEVCAPS_DRAWPRIMITIVES2EX 0x000008000
#define WINED3DDEVCAPS_HWTRANSFORMANDLIGHT 0x000010000
#define WINED3DDEVCAPS_CANBLTSYSTONONLOCAL 0x000020000
#define WINED3DDEVCAPS_HWRASTERIZATION 0x000080000
#define WINED3DDEVCAPS_PUREDEVICE 0x000100000
#define WINED3DDEVCAPS_QUINTICRTPATCHES 0x000200000
#define WINED3DDEVCAPS_RTPATCHES 0x000400000
#define WINED3DDEVCAPS_RTPATCHHANDLEZERO 0x000800000
#define WINED3DDEVCAPS_NPATCHES 0x001000000
#endif