wine-commits May 2010

wine-commits@winehq.org

3 participants
955 discussions

Rico Schüller : d3d10: Implement ID3D10Effect:: GetVariableBySemantic().
by Alexandre Julliard 06 May '10

06 May '10

Module: wine Branch: master Commit: 337c5d2730a02ee94fb97aa0df011f791d6b3f06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=337c5d2730a02ee94fb97aa0d… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed May 5 19:01:54 2010 +0200 d3d10: Implement ID3D10Effect::GetVariableBySemantic(). --- dlls/d3d10/effect.c | 43 +++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 41 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index c43f88a..016e842 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -2220,9 +2220,48 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableB static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableBySemantic(ID3D10Effect *iface, LPCSTR semantic) { - FIXME("iface %p, semantic %s stub!\n", iface, debugstr_a(semantic)); + struct d3d10_effect *This = (struct d3d10_effect *)iface; + unsigned int i; + + TRACE("iface %p, semantic %s\n", iface, debugstr_a(semantic)); + + if (!semantic) + { + WARN("Invalid semantic specified\n"); + return (ID3D10EffectVariable *)&null_variable; + } - return NULL; + for (i = 0; i < This->local_buffer_count; ++i) + { + struct d3d10_effect_variable *l = &This->local_buffers[i]; + unsigned int j; + + for (j = 0; j < l->type->member_count; ++j) + { + struct d3d10_effect_variable *v = &l->members[j]; + + if (!strcmp(v->semantic, semantic)) + { + TRACE("Returning variable %p.\n", v); + return (ID3D10EffectVariable *)v; + } + } + } + + for (i = 0; i < This->local_variable_count; ++i) + { + struct d3d10_effect_variable *v = &This->local_variables[i]; + + if (!strcmp(v->semantic, semantic)) + { + TRACE("Returning variable %p.\n", v); + return (ID3D10EffectVariable *)v; + } + } + + WARN("Invalid semantic specified\n"); + + return (ID3D10EffectVariable *)&null_variable; } static struct ID3D10EffectTechnique * STDMETHODCALLTYPE d3d10_effect_GetTechniqueByIndex(ID3D10Effect *iface,

1 0

Rico Schüller : d3d10: Parse semantic in parse_fx10_local_variable().
by Alexandre Julliard 06 May '10

06 May '10

Module: wine Branch: master Commit: be3c8db22c138e94459db3ac0adb24f28b3162fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=be3c8db22c138e94459db3ac0… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed May 5 19:00:44 2010 +0200 d3d10: Parse semantic in parse_fx10_local_variable(). --- dlls/d3d10/effect.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 59b6c31..c43f88a 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1284,11 +1284,22 @@ static HRESULT parse_fx10_local_variable(struct d3d10_effect_variable *v, const { unsigned int i; HRESULT hr; + DWORD offset; hr = parse_fx10_variable_head(v, ptr, data); if (FAILED(hr)) return hr; - skip_dword_unknown(ptr, 2); + read_dword(ptr, &offset); + TRACE("Variable semantic at offset %#x.\n", offset); + + if (!copy_name(data + offset, &v->semantic)) + { + ERR("Failed to copy semantic.\n"); + return E_OUTOFMEMORY; + } + TRACE("Variable semantic: %s.\n", debugstr_a(v->semantic)); + + skip_dword_unknown(ptr, 1); switch (v->type->basetype) {

1 0

Sven Baars : gphoto2.ds: Fix Dutch translation and alignment.
by Alexandre Julliard 06 May '10

06 May '10

Module: wine Branch: master Commit: 35c6beeba268c315e4f61d876544f527ace59363 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35c6beeba268c315e4f61d876… Author: Sven Baars <sven.wine(a)gmail.com> Date: Wed May 5 18:55:37 2010 +0200 gphoto2.ds: Fix Dutch translation and alignment. --- dlls/gphoto2.ds/gphoto2_Nl.rc | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/gphoto2.ds/gphoto2_Nl.rc b/dlls/gphoto2.ds/gphoto2_Nl.rc index 39bcdf2..5ee68fd 100644 --- a/dlls/gphoto2.ds/gphoto2_Nl.rc +++ b/dlls/gphoto2.ds/gphoto2_Nl.rc @@ -31,18 +31,18 @@ BEGIN CONTROL "List1",IDC_LIST1,"SysListView32", LVS_ICON | WS_BORDER | WS_TABSTOP,7,7,358,229 DEFPUSHBUTTON "Importeer geselecteerde bestanden",IDC_IMPORT,120,252,120,14 - PUSHBUTTON "Preview",IDC_FETCH,7,252,48,14 + PUSHBUTTON "Voorbeeld",IDC_FETCH,7,252,48,14 PUSHBUTTON "Importeer alles",IDC_IMPORTALL,60,252,56,14 - CONTROL "Skip This Dialog",IDC_SKIP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,244,252,76,14 - PUSHBUTTON "Afsluiten",IDC_EXIT,315,252,50,14 + CONTROL "Sla dit venster over",IDC_SKIP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,244,252,76,14 + PUSHBUTTON "Afsluiten",IDC_EXIT,320,252,45,14 END IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTER | DS_SETFOREGROUND -CAPTION "Transporteren" +CAPTION "Verplaatsen" FONT 8, "MS Sans Serif" BEGIN - LTEXT "Transporteren... Even geduld",IDC_STATIC,5,19,176,8, SS_CENTER + LTEXT "Verplaatsen... Even geduld",IDC_STATIC,5,19,176,8, SS_CENTER END IDD_CONNECTING DIALOG DISCARDABLE 0, 0, 280, 116 @@ -52,5 +52,5 @@ FONT 8, "MS Sans Serif" BEGIN CONTROL "",IDC_BITMAP,"Static",SS_BITMAP|SS_CENTERIMAGE,4,4,110,110 LTEXT "Verbinden met camera... Even geduld",IDC_STATIC,128,58, - 116,8 + 120,8 END

1 0

Sven Baars : credui: Fix Dutch translation.
by Alexandre Julliard 06 May '10

06 May '10

Module: wine Branch: master Commit: 079c01c508a29c8c4193322af4b14383cffb176a URL: http://source.winehq.org/git/wine.git/?a=commit;h=079c01c508a29c8c4193322af… Author: Sven Baars <sven.wine(a)gmail.com> Date: Wed May 5 18:55:05 2010 +0200 credui: Fix Dutch translation. --- dlls/credui/credui_Nl.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/credui/credui_Nl.rc b/dlls/credui/credui_Nl.rc index 575496c..ac67a37 100644 --- a/dlls/credui/credui_Nl.rc +++ b/dlls/credui/credui_Nl.rc @@ -30,12 +30,12 @@ BEGIN CONTROL IDB_BANNER,-1,"Static",SS_BITMAP | SS_CENTERIMAGE,0, 0,213,37 LTEXT "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP - LTEXT "&Gebruikers naam:",-1,8,62,72,12,SS_CENTERIMAGE + LTEXT "&Gebruikersnaam:",-1,8,62,72,12,SS_CENTERIMAGE CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87 LTEXT "&Wachtwoord:",-1,8,80,72,12,SS_CENTERIMAGE EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL - CONTROL "&Onthoudt mijn wachtwoord",IDC_SAVE,"Button", + CONTROL "&Onthoud mijn wachtwoord",IDC_SAVE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,80,98,126,12 DEFPUSHBUTTON "OK",IDOK,97,128,50,14 PUSHBUTTON "Annuleren",IDCANCEL,156,128,50,14 @@ -45,7 +45,7 @@ STRINGTABLE DISCARDABLE { IDS_TITLEFORMAT "Verbind met %s" IDS_MESSAGEFORMAT "Verbinden met %s" - IDS_INCORRECTPASSWORDTITLE "Aanloggen mislukt" + IDS_INCORRECTPASSWORDTITLE "Inloggen mislukt" IDS_INCORRECTPASSWORD "Controleer of uw gebruikersnaam\nen wachtwoord correct zijn." IDS_CAPSLOCKONTITLE "Caps Lock staat Aan" IDS_CAPSLOCKON "Met Caps Lock aan kan uw wachtwoord verkeerd worden ingevoerd.\n\nDruk op de Caps Lock toets op uw toetsenbord om Caps Lock uit\nte zetten voor invoer van uw wachtwoord."

1 0

Aric Stewart : usp10: ScriptTextOut reorders glyphs that are RTL if they have been processed with fLogicalOrder in previous calls .
by Alexandre Julliard 06 May '10

06 May '10

Module: wine Branch: master Commit: 2ba0048541d39e8cfef8d2b7c65f824bfd05ccaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ba0048541d39e8cfef8d2b7c… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed May 5 13:30:33 2010 -0500 usp10: ScriptTextOut reorders glyphs that are RTL if they have been processed with fLogicalOrder in previous calls. --- dlls/usp10/usp10.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index b736966..3a7fcd1 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1578,8 +1578,25 @@ HRESULT WINAPI ScriptTextOut(const HDC hdc, SCRIPT_CACHE *psc, int x, int y, UIN if (!psa->fNoGlyphIndex) /* Have Glyphs? */ fuOptions |= ETO_GLYPH_INDEX; /* Say don't do translation to glyph */ - if (!ExtTextOutW(hdc, x, y, fuOptions, lprc, pwGlyphs, cGlyphs, NULL)) - hr = S_FALSE; + if (psa->fRTL && psa->fLogicalOrder) + { + int i; + WORD *rtlGlyphs; + + rtlGlyphs = heap_alloc(cGlyphs * sizeof(WORD)); + if (!rtlGlyphs) + return E_OUTOFMEMORY; + + for (i = 0; i < cGlyphs; i++) + rtlGlyphs[i] = pwGlyphs[cGlyphs-1-i]; + + if (!ExtTextOutW(hdc, x, y, fuOptions, lprc, rtlGlyphs, cGlyphs, NULL)) + hr = S_FALSE; + heap_free(rtlGlyphs); + } + else + if (!ExtTextOutW(hdc, x, y, fuOptions, lprc, pwGlyphs, cGlyphs, NULL)) + hr = S_FALSE; return hr; }

1 0

Aric Stewart : usp10: Fix ScriptGetCMap handling of unsupported glyphs.
by Alexandre Julliard 06 May '10

06 May '10

Module: wine Branch: master Commit: abae85b9767dce7c4eb62f8faffdb328b664dd03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abae85b9767dce7c4eb62f8fa… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed May 5 11:51:52 2010 -0500 usp10: Fix ScriptGetCMap handling of unsupported glyphs. --- dlls/usp10/tests/usp10.c | 15 +++++++++++++-- dlls/usp10/usp10.c | 9 ++++++++- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index ad65b25..f76f95c 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -583,10 +583,12 @@ static void test_ScriptGetCMap(HDC hdc, unsigned short pwOutGlyphs[256]) int cInChars; int cChars; unsigned short pwOutGlyphs3[256]; - WCHAR TestItem1[] = {'T', 'e', 's', 't', 'a', 0}; DWORD dwFlags; int cnt; + static const WCHAR TestItem1[] = {'T', 'e', 's', 't', 'a', 0}; + static const WCHAR TestItem2[] = {0x202B, 'i', 'n', 0x202C,0}; + /* Check to make sure that SCRIPT_CACHE gets allocated ok */ dwFlags = 0; cInChars = cChars = 5; @@ -627,10 +629,19 @@ static void test_ScriptGetCMap(HDC hdc, unsigned short pwOutGlyphs[256]) for (cnt=0; cnt < cChars && pwOutGlyphs[cnt] == pwOutGlyphs3[cnt]; cnt++) {} ok (cnt == cInChars, "Translation not correct. WCHAR %d - %04x != %04x\n", cnt, pwOutGlyphs[cnt], pwOutGlyphs3[cnt]); - + hr = ScriptFreeCache( &psc); ok (!psc, "psc is not null after ScriptFreeCache\n"); + cInChars = cChars = 4; + hr = ScriptGetCMap(hdc, &psc, TestItem2, cInChars, dwFlags, pwOutGlyphs3); + ok (hr == S_FALSE, "ScriptGetCMap should return S_FALSE not (%08x)\n", hr); + ok (psc != NULL, "psc should not be null and have SCRIPT_CACHE buffer address\n"); + ok(pwOutGlyphs3[0] == 0, "Glyph 0 should be default glyph\n"); + ok(pwOutGlyphs3[3] == 0, "Glyph 0 should be default glyph\n"); + + hr = ScriptFreeCache( &psc); + ok (!psc, "psc is not null after ScriptFreeCache\n"); } static void test_ScriptGetFontProperties(HDC hdc) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 0ab86a1..b736966 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1528,6 +1528,8 @@ HRESULT WINAPI ScriptGetCMap(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcInChars if ((hr = init_script_cache(hdc, psc)) != S_OK) return hr; + hr = S_OK; + if ((get_cache_pitch_family(psc) & TMPF_TRUETYPE)) { for (i = 0; i < cChars; i++) @@ -1537,6 +1539,11 @@ HRESULT WINAPI ScriptGetCMap(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcInChars WORD glyph; if (!hdc) return E_PENDING; if (GetGlyphIndicesW(hdc, &pwcInChars[i], 1, &glyph, GGI_MARK_NONEXISTING_GLYPHS) == GDI_ERROR) return S_FALSE; + if (glyph == 0xffff) + { + hr = S_FALSE; + glyph = 0x0; + } pwOutGlyphs[i] = set_cache_glyph(psc, pwcInChars[i], glyph); } } @@ -1546,7 +1553,7 @@ HRESULT WINAPI ScriptGetCMap(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcInChars TRACE("no glyph translation\n"); for (i = 0; i < cChars; i++) pwOutGlyphs[i] = pwcInChars[i]; } - return S_OK; + return hr; } /***********************************************************************

1 0

Henri Verbeet : wined3d: Reorganize IWineD3DImpl_CheckDeviceFormat() a bit.
by Alexandre Julliard 06 May '10

06 May '10

Module: wine Branch: master Commit: 6d68701fb322a2cf5b0192d982af431960e0d9ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d68701fb322a2cf5b0192d98… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 5 18:22:37 2010 +0200 wined3d: Reorganize IWineD3DImpl_CheckDeviceFormat() a bit. --- dlls/wined3d/directx.c | 637 +++++++++++++++++++++++------------------------ 1 files changed, 312 insertions(+), 325 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6d68701fb322a2cf5b019…

1 0

Henri Verbeet : wined3d: Remove the unused device type parameter to some format capability checking functions .
by Alexandre Julliard 06 May '10

06 May '10

Module: wine Branch: master Commit: 6478e41b971b354a92982453bba3ccc4879ffee9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6478e41b971b354a92982453b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 5 18:22:38 2010 +0200 wined3d: Remove the unused device type parameter to some format capability checking functions. --- dlls/wined3d/directx.c | 29 +++++++++++++---------------- 1 files changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ed2647f..4df04fa 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3201,8 +3201,7 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceType(IWineD3D *iface, UINT Adapter /* Check if we support bumpmapping for a format */ -static BOOL CheckBumpMapCapability(struct wined3d_adapter *adapter, - WINED3DDEVTYPE DeviceType, const struct wined3d_format_desc *format_desc) +static BOOL CheckBumpMapCapability(struct wined3d_adapter *adapter, const struct wined3d_format_desc *format_desc) { /* Ask the fixed function pipeline implementation if it can deal * with the conversion. If we've got a GL extension giving native @@ -3302,8 +3301,7 @@ static BOOL CheckSrgbReadCapability(struct wined3d_adapter *adapter, const struc && (format_desc->Flags & WINED3DFMT_FLAG_SRGB_READ); } -static BOOL CheckSrgbWriteCapability(struct wined3d_adapter *adapter, - WINED3DDEVTYPE DeviceType, const struct wined3d_format_desc *format_desc) +static BOOL CheckSrgbWriteCapability(struct wined3d_adapter *adapter, const struct wined3d_format_desc *format_desc) { /* Only offer SRGB writing on X8R8G8B8/A8R8G8B8 when we use ARB or GLSL shaders as we are * doing the color fixup in shaders. @@ -3349,8 +3347,7 @@ static BOOL CheckWrapAndMipCapability(struct wined3d_adapter *adapter, const str } /* Check if a texture format is supported on the given adapter */ -static BOOL CheckTextureCapability(struct wined3d_adapter *adapter, - WINED3DDEVTYPE DeviceType, const struct wined3d_format_desc *format_desc) +static BOOL CheckTextureCapability(struct wined3d_adapter *adapter, const struct wined3d_format_desc *format_desc) { const struct wined3d_gl_info *gl_info = &adapter->gl_info; @@ -3582,7 +3579,7 @@ static BOOL CheckTextureCapability(struct wined3d_adapter *adapter, static BOOL CheckSurfaceCapability(struct wined3d_adapter *adapter, const struct wined3d_format_desc *adapter_format_desc, - WINED3DDEVTYPE DeviceType, const struct wined3d_format_desc *check_format_desc, + const struct wined3d_format_desc *check_format_desc, WINED3DSURFTYPE SurfaceType) { if(SurfaceType == SURFACE_GDI) { @@ -3615,7 +3612,7 @@ static BOOL CheckSurfaceCapability(struct wined3d_adapter *adapter, } /* All format that are supported for textures are supported for surfaces as well */ - if (CheckTextureCapability(adapter, DeviceType, check_format_desc)) return TRUE; + if (CheckTextureCapability(adapter, check_format_desc)) return TRUE; /* All depth stencil formats are supported on surfaces */ if (CheckDepthStencilCapability(adapter, adapter_format_desc, check_format_desc)) return TRUE; @@ -3688,7 +3685,7 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt return WINED3DERR_NOTAVAILABLE; } - if (!CheckTextureCapability(adapter, DeviceType, format_desc)) + if (!CheckTextureCapability(adapter, format_desc)) { TRACE_(d3d_caps)("[FAILED] - Cube texture format not supported\n"); return WINED3DERR_NOTAVAILABLE; @@ -3754,7 +3751,7 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt if (Usage & WINED3DUSAGE_QUERY_SRGBWRITE) { - if (!CheckSrgbWriteCapability(adapter, DeviceType, format_desc)) + if (!CheckSrgbWriteCapability(adapter, format_desc)) { TRACE_(d3d_caps)("[FAILED] - No query srgbwrite support\n"); return WINED3DERR_NOTAVAILABLE; @@ -3789,7 +3786,7 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt * - WINED3DUSAGE_NONSECURE (d3d9ex) * - WINED3DUSAGE_RENDERTARGET */ - if (!CheckSurfaceCapability(adapter, adapter_format_desc, DeviceType, format_desc, SurfaceType)) + if (!CheckSurfaceCapability(adapter, adapter_format_desc, format_desc, SurfaceType)) { TRACE_(d3d_caps)("[FAILED] - Not supported for plain surfaces\n"); return WINED3DERR_NOTAVAILABLE; @@ -3844,7 +3841,7 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt return WINED3DERR_NOTAVAILABLE; } - if (!CheckTextureCapability(adapter, DeviceType, format_desc)) + if (!CheckTextureCapability(adapter, format_desc)) { TRACE_(d3d_caps)("[FAILED] - Texture format not supported\n"); return WINED3DERR_NOTAVAILABLE; @@ -3890,7 +3887,7 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt if (Usage & WINED3DUSAGE_QUERY_LEGACYBUMPMAP) { - if (!CheckBumpMapCapability(adapter, DeviceType, format_desc)) + if (!CheckBumpMapCapability(adapter, format_desc)) { TRACE_(d3d_caps)("[FAILED] - No legacy bumpmap support\n"); return WINED3DERR_NOTAVAILABLE; @@ -3920,7 +3917,7 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt if (Usage & WINED3DUSAGE_QUERY_SRGBWRITE) { - if (!CheckSrgbWriteCapability(adapter, DeviceType, format_desc)) + if (!CheckSrgbWriteCapability(adapter, format_desc)) { TRACE_(d3d_caps)("[FAILED] - No query srgbwrite support\n"); return WINED3DERR_NOTAVAILABLE; @@ -3983,7 +3980,7 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt return WINED3DERR_NOTAVAILABLE; } - if (!CheckTextureCapability(adapter, DeviceType, format_desc)) + if (!CheckTextureCapability(adapter, format_desc)) { TRACE_(d3d_caps)("[FAILED] - Format not supported\n"); return WINED3DERR_NOTAVAILABLE; @@ -4083,7 +4080,7 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt if (Usage & WINED3DUSAGE_QUERY_SRGBWRITE) { - if (!CheckSrgbWriteCapability(adapter, DeviceType, format_desc)) + if (!CheckSrgbWriteCapability(adapter, format_desc)) { TRACE_(d3d_caps)("[FAILED] - No query srgbwrite support\n"); return WINED3DERR_NOTAVAILABLE;

1 0

Henri Verbeet : wined3d: Use the FBO cache in swapchain_blit().
by Alexandre Julliard 06 May '10

06 May '10

Module: wine Branch: master Commit: 7a2debe113198fab0756dab5a3d1ecf7550c5a9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a2debe113198fab0756dab5a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 5 18:22:36 2010 +0200 wined3d: Use the FBO cache in swapchain_blit(). --- dlls/wined3d/context.c | 5 ----- dlls/wined3d/swapchain.c | 5 ++--- dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 24624ab..d240686 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -841,11 +841,6 @@ static void context_destroy_gl_resources(struct wined3d_context *context) if (context->valid) { - if (context->src_fbo) - { - TRACE("Destroy src FBO %d\n", context->src_fbo); - context_destroy_fbo(context, &context->src_fbo); - } if (context->dst_fbo) { TRACE("Destroy dst FBO %d\n", context->dst_fbo); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index b5d2d70..eeb1278 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -117,9 +117,8 @@ static void swapchain_blit(IWineD3DSwapChainImpl *This, struct wined3d_context * if (gl_info->fbo_ops.glBlitFramebuffer && is_identity_fixup(backbuffer->resource.format_desc->color_fixup)) { ENTER_GL(); - context_bind_fbo(context, GL_READ_FRAMEBUFFER, &context->src_fbo); - context_attach_surface_fbo(context, GL_READ_FRAMEBUFFER, 0, backbuffer); - context_attach_depth_stencil_fbo(context, GL_READ_FRAMEBUFFER, NULL, FALSE); + context_apply_fbo_state_blit(context, GL_READ_FRAMEBUFFER, backbuffer, NULL); + glReadBuffer(GL_COLOR_ATTACHMENT0); context_bind_fbo(context, GL_DRAW_FRAMEBUFFER, NULL); context_set_draw_buffer(context, GL_BACK); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8181b31..179b4c4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1087,7 +1087,6 @@ struct wined3d_context struct list fbo_list; struct list fbo_destroy_list; struct fbo_entry *current_fbo; - GLuint src_fbo; GLuint dst_fbo; GLuint fbo_read_binding; GLuint fbo_draw_binding;

1 0

Henri Verbeet : wined3d: Use the FBO cache in stretch_rect_fbo().
by Alexandre Julliard 06 May '10

06 May '10

Module: wine Branch: master Commit: 3345146d0b6d27b441918beb4f17b3b3feaee069 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3345146d0b6d27b441918beb4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 5 18:22:35 2010 +0200 wined3d: Use the FBO cache in stretch_rect_fbo(). --- dlls/wined3d/context.c | 2 +- dlls/wined3d/device.c | 8 ++------ dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index ae4f754..24624ab 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -470,7 +470,7 @@ static void context_apply_fbo_state(struct wined3d_context *context, GLenum targ } /* GL locking is done by the caller */ -static void context_apply_fbo_state_blit(struct wined3d_context *context, GLenum target, +void context_apply_fbo_state_blit(struct wined3d_context *context, GLenum target, IWineD3DSurfaceImpl *render_target, IWineD3DSurfaceImpl *depth_stencil) { if (surface_is_offscreen(render_target)) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3001b3b..f001591 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5808,11 +5808,9 @@ void stretch_rect_fbo(IWineD3DDeviceImpl *device, IWineD3DSurfaceImpl *src_surfa } else { TRACE("Source surface %p is offscreen\n", src_surface); ENTER_GL(); - context_bind_fbo(context, GL_READ_FRAMEBUFFER, &context->src_fbo); - context_attach_surface_fbo(context, GL_READ_FRAMEBUFFER, 0, src_surface); + context_apply_fbo_state_blit(context, GL_READ_FRAMEBUFFER, src_surface, NULL); glReadBuffer(GL_COLOR_ATTACHMENT0); checkGLcall("glReadBuffer()"); - context_attach_depth_stencil_fbo(context, GL_READ_FRAMEBUFFER, NULL, FALSE); } LEAVE_GL(); @@ -5847,10 +5845,8 @@ void stretch_rect_fbo(IWineD3DDeviceImpl *device, IWineD3DSurfaceImpl *src_surfa TRACE("Destination surface %p is offscreen\n", dst_surface); ENTER_GL(); - context_bind_fbo(context, GL_DRAW_FRAMEBUFFER, &context->dst_fbo); - context_attach_surface_fbo(context, GL_DRAW_FRAMEBUFFER, 0, dst_surface); + context_apply_fbo_state_blit(context, GL_DRAW_FRAMEBUFFER, dst_surface, NULL); context_set_draw_buffer(context, GL_COLOR_ATTACHMENT0); - context_attach_depth_stencil_fbo(context, GL_DRAW_FRAMEBUFFER, NULL, FALSE); } glDisable(GL_SCISSOR_TEST); IWineD3DDeviceImpl_MarkStateDirty(device, STATE_RENDER(WINED3DRS_SCISSORTESTENABLE)); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cad88b9..8181b31 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1196,6 +1196,8 @@ void context_apply_blit_state(struct wined3d_context *context, IWineD3DDeviceImp void context_apply_clear_state(struct wined3d_context *context, IWineD3DDeviceImpl *device, IWineD3DSurfaceImpl *render_target, IWineD3DSurfaceImpl *depth_stencil) DECLSPEC_HIDDEN; void context_apply_draw_state(struct wined3d_context *context, IWineD3DDeviceImpl *device) DECLSPEC_HIDDEN; +void context_apply_fbo_state_blit(struct wined3d_context *context, GLenum target, + IWineD3DSurfaceImpl *render_target, IWineD3DSurfaceImpl *depth_stencil) DECLSPEC_HIDDEN; void context_attach_depth_stencil_fbo(struct wined3d_context *context, GLenum fbo_target, IWineD3DSurfaceImpl *depth_stencil, BOOL use_render_buffer) DECLSPEC_HIDDEN; void context_attach_surface_fbo(const struct wined3d_context *context,

1 0

← Newer
1
...
75
76
77
78
79
80
81
...
96
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2010