February 2007 - Wine-Commits

Dmitry Timoshkov : gdi32: Skip the SYMBOL_CHARSET test if Symbol or Wingdings is not installed.
by Alexandre Julliard Feb. 15, 2007

Feb. 15, 2007

Module: wine Branch: master Commit: 8295d9040b389ca81ef1136758a87951dd1f6a67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8295d9040b389ca81ef113675… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Feb 15 23:14:01 2007 +0800 gdi32: Skip the SYMBOL_CHARSET test if Symbol or Wingdings is not installed. --- dlls/gdi32/tests/font.c | 40 +++++++++++++++++++++++++++++++++++----- 1 files changed, 35 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 2d19c8c..ada2c7f 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -827,8 +827,10 @@ static BOOL get_glyph_indices(INT charset, UINT code_page, WORD *idx, UINT count LOGFONTA lf; HFONT hfont, hfont_old; CHARSETINFO csi; + FONTSIGNATURE fs; INT cs; DWORD i, ret; + char name[64]; assert(count <= 128); @@ -844,9 +846,24 @@ static BOOL get_glyph_indices(INT charset, UINT code_page, WORD *idx, UINT count hdc = GetDC(0); hfont_old = SelectObject(hdc, hfont); - cs = GetTextCharset(hdc); + cs = GetTextCharsetInfo(hdc, &fs, 0); ok(cs == charset, "expected %d, got %d\n", charset, cs); + SetLastError(0xdeadbeef); + ret = GetTextFace(hdc, sizeof(name), name); + ok(ret, "GetTextFace error %u\n", GetLastError()); + + if (charset == SYMBOL_CHARSET) + { + ok(strcmp("Arial", name), "face name should NOT be Arial\n"); + ok(fs.fsCsb[0] & (1 << 31), "symbol encoding should be available\n"); + } + else + { + ok(!strcmp("Arial", name), "face name should be Arial, not %s\n", name); + ok(!(fs.fsCsb[0] & (1 << 31)), "symbol encoding should NOT be available\n"); + } + if (!TranslateCharsetInfo((DWORD *)cs, &csi, TCI_SRCCHARSET)) { trace("Can't find codepage for charset %d\n", cs); @@ -1020,8 +1037,8 @@ static void test_font_charset(void) } cd[] = { { ANSI_CHARSET, 1252 }, - { SYMBOL_CHARSET, CP_SYMBOL }, - { RUSSIAN_CHARSET, 1251 } + { RUSSIAN_CHARSET, 1251 }, + { SYMBOL_CHARSET, CP_SYMBOL } /* keep it as the last one */ }; int i; @@ -1042,14 +1059,27 @@ static void test_font_charset(void) for (i = 0; i < sizeof(cd)/sizeof(cd[0]); i++) { + if (cd[i].charset == SYMBOL_CHARSET) + { + if (!is_font_installed("Symbol") && !is_font_installed("Wingdings")) + { + skip("Symbol or Wingdings is not installed\n"); + break; + } + } get_glyph_indices(cd[i].charset, cd[i].code_page, cd[i].font_idxA, 128, FALSE); get_glyph_indices(cd[i].charset, cd[i].code_page, cd[i].font_idxW, 128, TRUE); ok(!memcmp(cd[i].font_idxA, cd[i].font_idxW, 128*sizeof(WORD)), "%d: indices don't match\n", i); } ok(memcmp(cd[0].font_idxW, cd[1].font_idxW, 128*sizeof(WORD)), "0 vs 1: indices shouldn't match\n"); - ok(memcmp(cd[0].font_idxW, cd[2].font_idxW, 128*sizeof(WORD)), "0 vs 2: indices shouldn't match\n"); - ok(memcmp(cd[1].font_idxW, cd[2].font_idxW, 128*sizeof(WORD)), "1 vs 2: indices shouldn't match\n"); + if (i > 2) + { + ok(memcmp(cd[0].font_idxW, cd[2].font_idxW, 128*sizeof(WORD)), "0 vs 2: indices shouldn't match\n"); + ok(memcmp(cd[1].font_idxW, cd[2].font_idxW, 128*sizeof(WORD)), "1 vs 2: indices shouldn't match\n"); + } + else + skip("Symbol or Wingdings is not installed\n"); } START_TEST(font)

1 0

Dmitry Timoshkov : gdi32: Fix a typo in the memcmp call.
by Alexandre Julliard Feb. 15, 2007

Feb. 15, 2007

Module: wine Branch: master Commit: 64e1ce40aa5925120b133238198022fd6ea078f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64e1ce40aa5925120b1332381… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Feb 15 21:27:28 2007 +0800 gdi32: Fix a typo in the memcmp call. --- dlls/gdi32/tests/font.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index e8e2527..2d19c8c 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1044,7 +1044,7 @@ static void test_font_charset(void) { get_glyph_indices(cd[i].charset, cd[i].code_page, cd[i].font_idxA, 128, FALSE); get_glyph_indices(cd[i].charset, cd[i].code_page, cd[i].font_idxW, 128, TRUE); - ok(!memcmp(cd[i].font_idxA, cd[i].font_idxW, 128), "%d: indices don't match\n", i); + ok(!memcmp(cd[i].font_idxA, cd[i].font_idxW, 128*sizeof(WORD)), "%d: indices don't match\n", i); } ok(memcmp(cd[0].font_idxW, cd[1].font_idxW, 128*sizeof(WORD)), "0 vs 1: indices shouldn't match\n");

1 0

H. Verbeet : wined3d: Get rid of any remaining d3d9 stuff in surface. c and surface_gdi.c.
by Alexandre Julliard Feb. 15, 2007

Feb. 15, 2007

Module: wine Branch: master Commit: 75ebf29e1b4020e773400e4ad1b5673ddba90007 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75ebf29e1b4020e773400e4ad… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Thu Feb 15 13:32:25 2007 +0100 wined3d: Get rid of any remaining d3d9 stuff in surface.c and surface_gdi.c. --- dlls/wined3d/surface.c | 6 +++--- dlls/wined3d/surface_gdi.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b8acb89..57a5b8a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -590,7 +590,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED (pRect->bottom > This->currentDesc.Height)) { WARN(" Invalid values in pRect !!!\n"); - return D3DERR_INVALIDCALL; + return WINED3DERR_INVALIDCALL; } if (This->resource.format == WINED3DFMT_DXT1) { /* DXT1 is half byte per pixel */ @@ -1330,7 +1330,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_ReleaseDC(IWineD3DSurface *iface, HDC hDC) { TRACE("(%p)->(%p)\n",This,hDC); if (!(This->Flags & SFLAG_DCINUSE)) - return D3DERR_INVALIDCALL; + return WINED3DERR_INVALIDCALL; /* we locked first, so unlock now */ IWineD3DSurface_UnlockRect(iface); @@ -2415,7 +2415,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * if( dstSwapchain->backBuffer && ((IWineD3DSurface *) This == dstSwapchain->frontBuffer) && SrcSurface == dstSwapchain->backBuffer[0] ) { - D3DSWAPEFFECT orig_swap = dstSwapchain->presentParms.SwapEffect; + WINED3DSWAPEFFECT orig_swap = dstSwapchain->presentParms.SwapEffect; /* The idea behind this is that a glReadPixels and a glDrawPixels call * take very long, while a flip is fast. diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index 1ef0383..87ee0d0 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -164,7 +164,7 @@ IWineGDISurfaceImpl_LockRect(IWineD3DSurface *iface, { ERR("(%p) Surface already locked\n", This); /* What should I return here? */ - return D3DERR_INVALIDCALL; + return WINED3DERR_INVALIDCALL; } if (!(This->Flags & SFLAG_LOCKABLE)) @@ -217,7 +217,7 @@ IWineGDISurfaceImpl_LockRect(IWineD3DSurface *iface, (pRect->bottom > This->currentDesc.Height)) { WARN(" Invalid values in pRect !!!\n"); - return D3DERR_INVALIDCALL; + return WINED3DERR_INVALIDCALL; } if (This->resource.format == WINED3DFMT_DXT1) @@ -1377,7 +1377,7 @@ HRESULT WINAPI IWineGDISurfaceImpl_LoadTexture(IWineD3DSurface *iface) { ERR("Unsupported on X11 surfaces\n"); - return D3DERR_INVALIDCALL; + return WINED3DERR_INVALIDCALL; } /*****************************************************************************

1 0

H. Verbeet : wined3d: Get rid of any remaining d3d9 stuff in stateblock.c.
by Alexandre Julliard Feb. 15, 2007

Feb. 15, 2007

Module: wine Branch: master Commit: 1a07d3142c210610da01572d3ce45654a63bff20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a07d3142c210610da01572d3… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Thu Feb 15 13:32:19 2007 +0100 wined3d: Get rid of any remaining d3d9 stuff in stateblock.c. --- dlls/wined3d/stateblock.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 6112f59..7622d8e 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -672,7 +672,7 @@ should really perform a delta so that only the changes get updated*/ } } - if (/*TODO: 'magic' statetype, replace with BOOL This->blockType == D3DSBT_RECORDED || */ This->blockType == D3DSBT_ALL || This->blockType == D3DSBT_PIXELSTATE) { + if (/*TODO: 'magic' statetype, replace with BOOL This->blockType == D3DSBT_RECORDED || */ This->blockType == WINED3DSBT_ALL || This->blockType == WINED3DSBT_PIXELSTATE) { /* Pixel Shader */ if (This->set.pixelShader && This->changed.pixelShader) { @@ -829,7 +829,7 @@ should really perform a delta so that only the changes get updated*/ stateblock_savedstates_copy(iface, &((IWineD3DDeviceImpl*)pDevice)->stateBlock->changed, &This->changed); ((IWineD3DDeviceImpl *)pDevice)->stateBlock->lowest_disabled_stage = MAX_TEXTURES - 1; for(j = 0; j < MAX_TEXTURES - 1; j++) { - if(((IWineD3DDeviceImpl *)pDevice)->stateBlock->textureState[j][D3DTSS_COLOROP] == WINED3DTOP_DISABLE) { + if(((IWineD3DDeviceImpl *)pDevice)->stateBlock->textureState[j][WINED3DTSS_COLOROP] == WINED3DTOP_DISABLE) { ((IWineD3DDeviceImpl *)pDevice)->stateBlock->lowest_disabled_stage = j; break; }

1 0

H. Verbeet : wined3d: Use WINED3DISSUE_BEGIN / WINED3DISSUE_END rather than D3DISSUE_BEGIN / D3DISSUE_END.
by Alexandre Julliard Feb. 15, 2007

Feb. 15, 2007

Module: wine Branch: master Commit: 618dc7da1f6412e6864ce0d89d84c079dde66e87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=618dc7da1f6412e6864ce0d89… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Thu Feb 15 13:32:06 2007 +0100 wined3d: Use WINED3DISSUE_BEGIN / WINED3DISSUE_END rather than D3DISSUE_BEGIN / D3DISSUE_END. --- dlls/wined3d/query.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 9dafb12..41bebf6 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -354,11 +354,11 @@ static HRESULT WINAPI IWineD3DQueryImpl_Issue(IWineD3DQuery* iface, DWORD dwIs switch (This->type) { case WINED3DQUERYTYPE_OCCLUSION: if (GL_SUPPORT(ARB_OCCLUSION_QUERY)) { - if (dwIssueFlags & D3DISSUE_BEGIN) { + if (dwIssueFlags & WINED3DISSUE_BEGIN) { GL_EXTCALL(glBeginQueryARB(GL_SAMPLES_PASSED_ARB, ((WineQueryOcclusionData *)This->extendedData)->queryId)); checkGLcall("glBeginQuery()"); } - if (dwIssueFlags & D3DISSUE_END) { + if (dwIssueFlags & WINED3DISSUE_END) { GL_EXTCALL(glEndQueryARB(GL_SAMPLES_PASSED_ARB)); checkGLcall("glEndQuery()"); }

1 0

H. Verbeet : wined3d: Get rid of any remaining d3d9 stuff in state.c.
by Alexandre Julliard Feb. 15, 2007

Feb. 15, 2007

Module: wine Branch: master Commit: a2fde7d9123b7432a8ce71c591a583f4198c3035 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2fde7d9123b7432a8ce71c59… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Thu Feb 15 13:32:13 2007 +0100 wined3d: Get rid of any remaining d3d9 stuff in state.c. --- dlls/wined3d/state.c | 68 +++++++++++++++++++++++++------------------------- 1 files changed, 34 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a2fde7d9123b7432a8ce7…

1 0

H. Verbeet : wined3d: Add the WINED3DSPD_IUNKNOWN flag and use it.
by Alexandre Julliard Feb. 15, 2007

Feb. 15, 2007

Module: wine Branch: master Commit: e8419403eec00e5eb3f3e059080e39c326b51a92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8419403eec00e5eb3f3e0590… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Thu Feb 15 13:32:00 2007 +0100 wined3d: Add the WINED3DSPD_IUNKNOWN flag and use it. --- dlls/wined3d/resource.c | 8 ++++---- include/wine/wined3d_types.h | 3 +++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index b65f50c..a463d82 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -115,7 +115,7 @@ HRESULT WINAPI IWineD3DResourceImpl_SetPrivateData(IWineD3DResource *iface, REFG #if 0 (*data)->uniquenessValue = This->uniquenessValue; #endif - if (Flags & D3DSPD_IUNKNOWN) { + if (Flags & WINED3DSPD_IUNKNOWN) { (*data)->ptr.object = (LPUNKNOWN)pData; (*data)->size = sizeof(LPUNKNOWN); IUnknown_AddRef((*data)->ptr.object); @@ -157,7 +157,7 @@ HRESULT WINAPI IWineD3DResourceImpl_GetPrivateData(IWineD3DResource *iface, REFG #if 0 /* This may not be right. */ - if (((*data)->flags & D3DSPD_VOLATILE) + if (((*data)->flags & WINED3DSPD_VOLATILE) && (*data)->uniquenessValue != This->uniquenessValue) return DDERR_EXPIRED; #endif @@ -166,7 +166,7 @@ HRESULT WINAPI IWineD3DResourceImpl_GetPrivateData(IWineD3DResource *iface, REFG return WINED3DERR_MOREDATA; } - if ((*data)->flags & D3DSPD_IUNKNOWN) { + if ((*data)->flags & WINED3DSPD_IUNKNOWN) { *(LPUNKNOWN *)pData = (*data)->ptr.object; IUnknown_AddRef((*data)->ptr.object); } @@ -187,7 +187,7 @@ HRESULT WINAPI IWineD3DResourceImpl_FreePrivateData(IWineD3DResource *iface, REF *data = (*data)->next; - if ((*data)->flags & D3DSPD_IUNKNOWN) + if ((*data)->flags & WINED3DSPD_IUNKNOWN) { if ((*data)->ptr.object != NULL) IUnknown_Release((*data)->ptr.object); diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index 38622ae..1421ddf 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -1562,4 +1562,7 @@ typedef enum _WINED3DSURFTYPE { #define WINED3DSTREAMSOURCE_INDEXEDDATA (1 << 30) #define WINED3DSTREAMSOURCE_INSTANCEDATA (2 << 30) +/* SetPrivateData flags */ +#define WINED3DSPD_IUNKNOWN 0x00000001 + #endif

1 0

H. Verbeet : wined3d: Use WINED3DRTYPE_SURFACE rather than D3DRTYPE_SURFACE .
by Alexandre Julliard Feb. 15, 2007

Feb. 15, 2007

Module: wine Branch: master Commit: 176a2a19c3f1ce82e4b78fe490560c8b2bcdd1b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=176a2a19c3f1ce82e4b78fe49… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Thu Feb 15 13:31:54 2007 +0100 wined3d: Use WINED3DRTYPE_SURFACE rather than D3DRTYPE_SURFACE. --- dlls/wined3d/palette.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/palette.c b/dlls/wined3d/palette.c index 9f2900c..43c942f 100644 --- a/dlls/wined3d/palette.c +++ b/dlls/wined3d/palette.c @@ -135,7 +135,7 @@ static HRESULT WINAPI IWineD3DPaletteImpl_SetEntries(IWineD3DPalette *iface, DW /* If the palette is attached to the render target, update all render targets */ for(res = This->wineD3DDevice->resources; res != NULL; res=res->next) { - if(IWineD3DResource_GetType(res->resource) == D3DRTYPE_SURFACE) { + if(IWineD3DResource_GetType(res->resource) == WINED3DRTYPE_SURFACE) { IWineD3DSurfaceImpl *impl = (IWineD3DSurfaceImpl *) res->resource; if(impl->palette == This) IWineD3DSurface_RealizePalette( (IWineD3DSurface *) res->resource);

1 0

H. Verbeet : wined3d: Add WINED3DVS20 & WINED3DVS20CAPS flags and use them.
by Alexandre Julliard Feb. 15, 2007

Feb. 15, 2007

Module: wine Branch: master Commit: e01f242a2af01a6e8c8e1000494e3f148a4a3d3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e01f242a2af01a6e8c8e10004… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Thu Feb 15 13:31:47 2007 +0100 wined3d: Add WINED3DVS20 & WINED3DVS20CAPS flags and use them. --- dlls/wined3d/directx.c | 10 +++++----- include/wine/wined3d_caps.h | 9 +++++++++ 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d554ab4..e8043d0 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2300,16 +2300,16 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, if(*pCaps->VertexShaderVersion == WINED3DVS_VERSION(3,0)) { /* Where possible set the caps based on OpenGL extensions and if they aren't set (in case of software rendering) use the VS 3.0 from MSDN or else if there's OpenGL spec use a hardcoded value minimum VS3.0 value. */ - *pCaps->VS20Caps.Caps = D3DVS20CAPS_PREDICATION; - *pCaps->VS20Caps.DynamicFlowControlDepth = D3DVS20_MAX_DYNAMICFLOWCONTROLDEPTH; /* VS 3.0 requires MAX_DYNAMICFLOWCONTROLDEPTH (24) */ + *pCaps->VS20Caps.Caps = WINED3DVS20CAPS_PREDICATION; + *pCaps->VS20Caps.DynamicFlowControlDepth = WINED3DVS20_MAX_DYNAMICFLOWCONTROLDEPTH; /* VS 3.0 requires MAX_DYNAMICFLOWCONTROLDEPTH (24) */ *pCaps->VS20Caps.NumTemps = max(32, This->gl_info.vs_arb_max_temps); - *pCaps->VS20Caps.StaticFlowControlDepth = D3DVS20_MAX_STATICFLOWCONTROLDEPTH ; /* level of nesting in loops / if-statements; VS 3.0 requires MAX (4) */ + *pCaps->VS20Caps.StaticFlowControlDepth = WINED3DVS20_MAX_STATICFLOWCONTROLDEPTH ; /* level of nesting in loops / if-statements; VS 3.0 requires MAX (4) */ *pCaps->MaxVShaderInstructionsExecuted = 65535; /* VS 3.0 needs at least 65535, some cards even use 2^32-1 */ *pCaps->MaxVertexShader30InstructionSlots = max(512, This->gl_info.vs_arb_max_instructions); } else if(*pCaps->VertexShaderVersion == WINED3DVS_VERSION(2,0)) { *pCaps->VS20Caps.Caps = 0; - *pCaps->VS20Caps.DynamicFlowControlDepth = D3DVS20_MIN_DYNAMICFLOWCONTROLDEPTH; + *pCaps->VS20Caps.DynamicFlowControlDepth = WINED3DVS20_MIN_DYNAMICFLOWCONTROLDEPTH; *pCaps->VS20Caps.NumTemps = max(12, This->gl_info.vs_arb_max_temps); *pCaps->VS20Caps.StaticFlowControlDepth = 1; @@ -2345,7 +2345,7 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, } else if(*pCaps->PixelShaderVersion == WINED3DPS_VERSION(2,0)) { /* Below we assume PS2.0 specs, not extended 2.0a(GeforceFX)/2.0b(Radeon R3xx) ones */ *pCaps->PS20Caps.Caps = 0; - *pCaps->PS20Caps.DynamicFlowControlDepth = 0; /* D3DVS20_MIN_DYNAMICFLOWCONTROLDEPTH = 0 */ + *pCaps->PS20Caps.DynamicFlowControlDepth = 0; /* WINED3DVS20_MIN_DYNAMICFLOWCONTROLDEPTH = 0 */ *pCaps->PS20Caps.NumTemps = max(12, This->gl_info.ps_arb_max_temps); *pCaps->PS20Caps.StaticFlowControlDepth = WINED3DPS20_MIN_STATICFLOWCONTROLDEPTH; /* Minumum: 1 */ *pCaps->PS20Caps.NumInstructionSlots = WINED3DPS20_MIN_NUMINSTRUCTIONSLOTS; /* Minimum number (64 ALU + 32 Texture), a GeforceFX uses 512 */ diff --git a/include/wine/wined3d_caps.h b/include/wine/wined3d_caps.h index 2814457..78c2f1a 100644 --- a/include/wine/wined3d_caps.h +++ b/include/wine/wined3d_caps.h @@ -138,4 +138,13 @@ #define WINED3DTEXOPCAPS_MULTIPLYADD 0x01000000 #define WINED3DTEXOPCAPS_LERP 0x02000000 +#define WINED3DVS20_MAX_DYNAMICFLOWCONTROLDEPTH 24 +#define WINED3DVS20_MIN_DYNAMICFLOWCONTROLDEPTH 0 +#define WINED3DVS20_MAX_NUMTEMPS 32 +#define WINED3DVS20_MIN_NUMTEMPS 12 +#define WINED3DVS20_MAX_STATICFLOWCONTROLDEPTH 4 +#define WINED3DVS20_MIN_STATICFLOWCONTROLDEPTH 1 + +#define WINED3DVS20CAPS_PREDICATION 0x00000001 + #endif /* __WINE_WINED3D_CAPS_H */

1 0

H. Verbeet : wined3d: Add WINED3DPS20 & WINED3DPS20CAPS flags and use them.
by Alexandre Julliard Feb. 15, 2007

Feb. 15, 2007

Module: wine Branch: master Commit: 594f7fd8825756b8eda0fb60b2738f5fd3860d67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=594f7fd8825756b8eda0fb60b… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Thu Feb 15 13:31:41 2007 +0100 wined3d: Add WINED3DPS20 & WINED3DPS20CAPS flags and use them. --- dlls/wined3d/directx.c | 20 ++++++++++---------- include/wine/wined3d_caps.h | 15 +++++++++++++++ 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 97b2f9d..d554ab4 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2330,15 +2330,15 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, use the PS 3.0 from MSDN or else if there's OpenGL spec use a hardcoded value minimum PS 3.0 value. */ /* Caps is more or less undocumented on MSDN but it appears to be used for PS20Caps based on results from R9600/FX5900/Geforce6800 cards from Windows */ - *pCaps->PS20Caps.Caps = D3DPS20CAPS_ARBITRARYSWIZZLE | - D3DPS20CAPS_GRADIENTINSTRUCTIONS | - D3DPS20CAPS_PREDICATION | - D3DPS20CAPS_NODEPENDENTREADLIMIT | - D3DPS20CAPS_NOTEXINSTRUCTIONLIMIT; - *pCaps->PS20Caps.DynamicFlowControlDepth = D3DPS20_MAX_DYNAMICFLOWCONTROLDEPTH; /* PS 3.0 requires MAX_DYNAMICFLOWCONTROLDEPTH (24) */ + *pCaps->PS20Caps.Caps = WINED3DPS20CAPS_ARBITRARYSWIZZLE | + WINED3DPS20CAPS_GRADIENTINSTRUCTIONS | + WINED3DPS20CAPS_PREDICATION | + WINED3DPS20CAPS_NODEPENDENTREADLIMIT | + WINED3DPS20CAPS_NOTEXINSTRUCTIONLIMIT; + *pCaps->PS20Caps.DynamicFlowControlDepth = WINED3DPS20_MAX_DYNAMICFLOWCONTROLDEPTH; /* PS 3.0 requires MAX_DYNAMICFLOWCONTROLDEPTH (24) */ *pCaps->PS20Caps.NumTemps = max(32, This->gl_info.ps_arb_max_temps); - *pCaps->PS20Caps.StaticFlowControlDepth = D3DPS20_MAX_STATICFLOWCONTROLDEPTH; /* PS 3.0 requires MAX_STATICFLOWCONTROLDEPTH (4) */ - *pCaps->PS20Caps.NumInstructionSlots = D3DPS20_MAX_NUMINSTRUCTIONSLOTS; /* PS 3.0 requires MAX_NUMINSTRUCTIONSLOTS (512) */ + *pCaps->PS20Caps.StaticFlowControlDepth = WINED3DPS20_MAX_STATICFLOWCONTROLDEPTH; /* PS 3.0 requires MAX_STATICFLOWCONTROLDEPTH (4) */ + *pCaps->PS20Caps.NumInstructionSlots = WINED3DPS20_MAX_NUMINSTRUCTIONSLOTS; /* PS 3.0 requires MAX_NUMINSTRUCTIONSLOTS (512) */ *pCaps->MaxPShaderInstructionsExecuted = 65535; *pCaps->MaxPixelShader30InstructionSlots = max(D3DMIN30SHADERINSTRUCTIONS, This->gl_info.ps_arb_max_instructions); @@ -2347,8 +2347,8 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, *pCaps->PS20Caps.Caps = 0; *pCaps->PS20Caps.DynamicFlowControlDepth = 0; /* D3DVS20_MIN_DYNAMICFLOWCONTROLDEPTH = 0 */ *pCaps->PS20Caps.NumTemps = max(12, This->gl_info.ps_arb_max_temps); - *pCaps->PS20Caps.StaticFlowControlDepth = D3DPS20_MIN_STATICFLOWCONTROLDEPTH; /* Minumum: 1 */ - *pCaps->PS20Caps.NumInstructionSlots = D3DPS20_MIN_NUMINSTRUCTIONSLOTS; /* Minimum number (64 ALU + 32 Texture), a GeforceFX uses 512 */ + *pCaps->PS20Caps.StaticFlowControlDepth = WINED3DPS20_MIN_STATICFLOWCONTROLDEPTH; /* Minumum: 1 */ + *pCaps->PS20Caps.NumInstructionSlots = WINED3DPS20_MIN_NUMINSTRUCTIONSLOTS; /* Minimum number (64 ALU + 32 Texture), a GeforceFX uses 512 */ *pCaps->MaxPShaderInstructionsExecuted = 512; /* Minimum value, a GeforceFX uses 1024 */ *pCaps->MaxPixelShader30InstructionSlots = 0; diff --git a/include/wine/wined3d_caps.h b/include/wine/wined3d_caps.h index 1a94b27..2814457 100644 --- a/include/wine/wined3d_caps.h +++ b/include/wine/wined3d_caps.h @@ -79,6 +79,21 @@ #define WINED3DPMISCCAPS_MRTPOSTPIXELSHADERBLENDING 0x00080000 #define WINED3DPMISCCAPS_FOGVERTEXCLAMPED 0x00100000 +#define WINED3DPS20_MAX_DYNAMICFLOWCONTROLDEPTH 24 +#define WINED3DPS20_MIN_DYNAMICFLOWCONTROLDEPTH 0 +#define WINED3DPS20_MAX_NUMTEMPS 32 +#define WINED3DPS20_MIN_NUMTEMPS 12 +#define WINED3DPS20_MAX_STATICFLOWCONTROLDEPTH 4 +#define WINED3DPS20_MIN_STATICFLOWCONTROLDEPTH 0 +#define WINED3DPS20_MAX_NUMINSTRUCTIONSLOTS 512 +#define WINED3DPS20_MIN_NUMINSTRUCTIONSLOTS 96 + +#define WINED3DPS20CAPS_ARBITRARYSWIZZLE 0x00000001 +#define WINED3DPS20CAPS_GRADIENTINSTRUCTIONS 0x00000002 +#define WINED3DPS20CAPS_PREDICATION 0x00000004 +#define WINED3DPS20CAPS_NODEPENDENTREADLIMIT 0x00000008 +#define WINED3DPS20CAPS_NOTEXINSTRUCTIONLIMIT 0x00000010 + #define WINED3DPTADDRESSCAPS_WRAP 0x00000001 #define WINED3DPTADDRESSCAPS_MIRROR 0x00000002 #define WINED3DPTADDRESSCAPS_CLAMP 0x00000004

1 0