- Wine-Commits - list.winehq.org

Zebediah Figura : wined3d: Handle texture LOD in wined3d_sampler_desc_from_sampler_states().
by Alexandre Julliard Nov. 7, 2023

Nov. 7, 2023

Module: wine Branch: master Commit: 980711a842a8b06a6db2c1ba7495b25cf6f66b0a URL: https://gitlab.winehq.org/wine/wine/-/commit/980711a842a8b06a6db2c1ba7495b2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Dec 30 14:31:40 2022 -0600 wined3d: Handle texture LOD in wined3d_sampler_desc_from_sampler_states(). --- dlls/wined3d/context_gl.c | 2 +- dlls/wined3d/sampler.c | 14 +++----------- dlls/wined3d/state.c | 10 +++++++++- dlls/wined3d/texture.c | 6 +++--- dlls/wined3d/view.c | 2 +- dlls/wined3d/wined3d_gl.h | 1 - 6 files changed, 17 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index b81f14a86ee..0c440d12d84 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -5920,7 +5920,7 @@ static void apply_texture_blit_state(const struct wined3d_gl_info *gl_info, stru texture->sampler_desc.address_u = WINED3D_TADDRESS_CLAMP; texture->sampler_desc.address_v = WINED3D_TADDRESS_CLAMP; texture->sampler_desc.srgb_decode = FALSE; - texture->base_level = level; + texture->sampler_desc.mip_base_level = level; } /* Context activation is done by the caller. */ diff --git a/dlls/wined3d/sampler.c b/dlls/wined3d/sampler.c index e93ab18f436..cebb7400631 100644 --- a/dlls/wined3d/sampler.c +++ b/dlls/wined3d/sampler.c @@ -307,24 +307,16 @@ static void texture_gl_apply_base_level(struct wined3d_texture_gl *texture_gl, const struct wined3d_sampler_desc *desc, const struct wined3d_gl_info *gl_info) { struct gl_texture *gl_tex; - unsigned int base_level; - - if (texture_gl->t.flags & WINED3D_TEXTURE_COND_NP2) - base_level = 0; - else if (desc->mip_filter == WINED3D_TEXF_NONE) - base_level = texture_gl->t.lod; - else - base_level = min(max(desc->mip_base_level, texture_gl->t.lod), texture_gl->t.level_count - 1); gl_tex = wined3d_texture_gl_get_gl_texture(texture_gl, texture_gl->t.flags & WINED3D_TEXTURE_IS_SRGB); - if (base_level != gl_tex->base_level) + if (desc->mip_base_level != gl_tex->sampler_desc.mip_base_level) { /* Note that WINED3D_SAMP_MAX_MIP_LEVEL specifies the largest mipmap * (default 0), while GL_TEXTURE_MAX_LEVEL specifies the smallest * mipmap used (default 1000). So WINED3D_SAMP_MAX_MIP_LEVEL * corresponds to GL_TEXTURE_BASE_LEVEL. */ - gl_info->gl_ops.gl.p_glTexParameteri(texture_gl->target, GL_TEXTURE_BASE_LEVEL, base_level); - gl_tex->base_level = base_level; + gl_info->gl_ops.gl.p_glTexParameteri(texture_gl->target, GL_TEXTURE_BASE_LEVEL, desc->mip_base_level); + gl_tex->sampler_desc.mip_base_level = desc->mip_base_level; } } diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 5bccd1acb4a..3e857a587ee 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3499,7 +3499,15 @@ static void wined3d_sampler_desc_from_sampler_states(struct wined3d_sampler_desc desc->lod_bias = lod_bias.f; desc->min_lod = -1000.0f; desc->max_lod = 1000.0f; - desc->mip_base_level = sampler_states[WINED3D_SAMP_MAX_MIP_LEVEL]; + + /* The LOD is already clamped to texture->level_count in wined3d_texture_set_lod(). */ + if (texture->flags & WINED3D_TEXTURE_COND_NP2) + desc->mip_base_level = 0; + else if (desc->mip_filter == WINED3D_TEXF_NONE) + desc->mip_base_level = texture->lod; + else + desc->mip_base_level = min(max(sampler_states[WINED3D_SAMP_MAX_MIP_LEVEL], texture->lod), texture->level_count - 1); + desc->max_anisotropy = sampler_states[WINED3D_SAMP_MAX_ANISOTROPY]; if ((sampler_states[WINED3D_SAMP_MAG_FILTER] != WINED3D_TEXF_ANISOTROPIC && sampler_states[WINED3D_SAMP_MIN_FILTER] != WINED3D_TEXF_ANISOTROPIC diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index a7fbde0f529..8fec60f2640 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1319,7 +1319,7 @@ void wined3d_texture_gl_bind(struct wined3d_texture_gl *texture_gl, gl_tex->sampler_desc.srgb_decode = TRUE; else gl_tex->sampler_desc.srgb_decode = srgb; - gl_tex->base_level = 0; + gl_tex->sampler_desc.mip_base_level = 0; wined3d_texture_set_dirty(&texture_gl->t); wined3d_context_gl_bind_texture(context_gl, target, gl_tex->name); @@ -1757,8 +1757,8 @@ unsigned int CDECL wined3d_texture_set_lod(struct wined3d_texture *texture, unsi wined3d_resource_wait_idle(resource); texture->lod = lod; - wined3d_texture_gl(texture)->texture_rgb.base_level = ~0u; - wined3d_texture_gl(texture)->texture_srgb.base_level = ~0u; + wined3d_texture_gl(texture)->texture_rgb.sampler_desc.mip_base_level = ~0u; + wined3d_texture_gl(texture)->texture_srgb.sampler_desc.mip_base_level = ~0u; if (resource->bind_count) wined3d_device_context_emit_set_sampler_state(&device->cs->c, texture->sampler, WINED3D_SAMP_MAX_MIP_LEVEL, device->cs->c.state->sampler_states[texture->sampler][WINED3D_SAMP_MAX_MIP_LEVEL]); diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index aa07625eb8a..5729d5909e6 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1350,7 +1350,7 @@ void wined3d_shader_resource_view_gl_generate_mipmap(struct wined3d_shader_resou if (!view_gl->gl_view.name) { - gl_tex->base_level = base_level; + gl_tex->sampler_desc.mip_base_level = base_level; gl_info->gl_ops.gl.p_glTexParameteri(texture_gl->target, GL_TEXTURE_MAX_LEVEL, texture_gl->t.level_count - 1); } diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index f5cec2ccdd7..e0253defc0f 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -943,7 +943,6 @@ static inline void wined3d_context_gl_reference_buffer(struct wined3d_context_gl struct gl_texture { struct wined3d_sampler_desc sampler_desc; - unsigned int base_level; GLuint name; };

1 0

Alexandre Julliard : include: Use proper dllimports for wmi functions.
by Alexandre Julliard Nov. 7, 2023

Nov. 7, 2023

Module: wine Branch: master Commit: 333ced9869ebb49a1d6830e842f866a0eb1439b1 URL: https://gitlab.winehq.org/wine/wine/-/commit/333ced9869ebb49a1d6830e842f866… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 3 17:31:39 2023 +0100 include: Use proper dllimports for wmi functions. --- dlls/wmi/Makefile.in | 1 + include/wmium.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wmi/Makefile.in b/dlls/wmi/Makefile.in index fde1177f9a5..9b6d56ab3da 100644 --- a/dlls/wmi/Makefile.in +++ b/dlls/wmi/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -D_WMI_SOURCE_ MODULE = wmi.dll IMPORTS = advapi32 diff --git a/include/wmium.h b/include/wmium.h index 887c2b4ccf5..bbb13a3dbf4 100644 --- a/include/wmium.h +++ b/include/wmium.h @@ -22,7 +22,7 @@ #ifdef _WMI_SOURCE_ #define WMIAPI __stdcall #else -#define WMIAPI DECLSPEC_HIDDEN __stdcall +#define WMIAPI DECLSPEC_IMPORT __stdcall #endif #include <guiddef.h>

1 0

Alexandre Julliard : include: Use proper dllimports for olectl functions.
by Alexandre Julliard Nov. 7, 2023

Nov. 7, 2023

Module: wine Branch: master Commit: b06a1ec1965245ab290bfb3f1ca691bb02aab5ef URL: https://gitlab.winehq.org/wine/wine/-/commit/b06a1ec1965245ab290bfb3f1ca691… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 3 17:32:20 2023 +0100 include: Use proper dllimports for olectl functions. --- include/olectl.h | 47 +++++++++++++++++++++-------------------------- 1 file changed, 21 insertions(+), 26 deletions(-) diff --git a/include/olectl.h b/include/olectl.h index 2ba37b48a5e..fe02a6236b9 100644 --- a/include/olectl.h +++ b/include/olectl.h @@ -27,7 +27,13 @@ extern "C" { #endif - +#ifdef _OLEAUT32_ +#define WINOLECTLAPI STDAPI +#define WINOLECTLAPI_(type) STDAPI_(type) +#else +#define WINOLECTLAPI DECLSPEC_IMPORT STDAPI +#define WINOLECTLAPI_(type) DECLSPEC_IMPORT STDAPI_(type) +#endif /* * Ole Control Interfaces @@ -183,44 +189,33 @@ typedef VARIANT_BOOL OLE_ENABLEDEFAULTBOOL; #define LP_VGACOLOR 0x2 #define LP_COLOR 0x4 -HRESULT WINAPI DllRegisterServer(void) DECLSPEC_HIDDEN; -HRESULT WINAPI DllUnregisterServer(void) DECLSPEC_HIDDEN; - -HCURSOR WINAPI OleIconToCursor( HINSTANCE hinstExe, HICON hicon); - -HRESULT WINAPI OleCreatePropertyFrameIndirect( LPOCPFIPARAMS lpParams); +HRESULT WINAPI DllRegisterServer(void); +HRESULT WINAPI DllUnregisterServer(void); -HRESULT WINAPI OleCreatePropertyFrame( +WINOLECTLAPI_(HCURSOR) OleIconToCursor( HINSTANCE hinstExe, HICON hicon); +WINOLECTLAPI OleCreatePropertyFrameIndirect( LPOCPFIPARAMS lpParams); +WINOLECTLAPI OleCreatePropertyFrame( HWND hwndOwner, UINT x, UINT y, LPCOLESTR lpszCaption, ULONG cObjects, LPUNKNOWN* ppUnk, ULONG cPages, LPCLSID pPageClsID, LCID lcid, DWORD dwReserved, LPVOID pvReserved ); - -HRESULT WINAPI OleLoadPicture( LPSTREAM lpstream, LONG lSize, BOOL fRunmode, +WINOLECTLAPI OleLoadPicture( LPSTREAM lpstream, LONG lSize, BOOL fRunmode, REFIID riid, LPVOID *lplpvObj ); - -HRESULT WINAPI OleLoadPictureEx( LPSTREAM lpstream, LONG lSize, BOOL fRunMode, +WINOLECTLAPI OleLoadPictureEx( LPSTREAM lpstream, LONG lSize, BOOL fRunMode, REFIID riid, DWORD xSizeDesired, DWORD ySizeDesired, DWORD dwFlags, LPVOID *lplpvObj ); - -HRESULT WINAPI OleLoadPictureFile( VARIANT varFilename, IDispatch **ppdispPicture ); - -HRESULT WINAPI OleLoadPictureFileEx( VARIANT varFilename, DWORD xSizeDesired, +WINOLECTLAPI OleLoadPictureFile( VARIANT varFilename, IDispatch **ppdispPicture ); +WINOLECTLAPI OleLoadPictureFileEx( VARIANT varFilename, DWORD xSizeDesired, DWORD ySizeDesired, DWORD dwFlags, IDispatch **ppdispPicture ); - -HRESULT WINAPI OleSavePictureFile( IDispatch *pdispPicture, BSTR bstrFilename ); - -HRESULT WINAPI OleLoadPicturePath( LPOLESTR szURLorPath, LPUNKNOWN punkCaller, +WINOLECTLAPI OleSavePictureFile( IDispatch *pdispPicture, BSTR bstrFilename ); +WINOLECTLAPI OleLoadPicturePath( LPOLESTR szURLorPath, LPUNKNOWN punkCaller, DWORD dwReserved, OLE_COLOR clrReserved, REFIID riid, LPVOID *ppvRet ); - -HRESULT WINAPI OleCreatePictureIndirect(LPPICTDESC lpPictDesc, REFIID riid, +WINOLECTLAPI OleCreatePictureIndirect(LPPICTDESC lpPictDesc, REFIID riid, BOOL fOwn, LPVOID * lplpvObj ); - -HRESULT WINAPI OleCreateFontIndirect(LPFONTDESC lpFontDesc, REFIID riid, +WINOLECTLAPI OleCreateFontIndirect(LPFONTDESC lpFontDesc, REFIID riid, LPVOID* lplpvObj); - -HRESULT WINAPI OleTranslateColor( OLE_COLOR clr, HPALETTE hpal, +WINOLECTLAPI OleTranslateColor( OLE_COLOR clr, HPALETTE hpal, COLORREF* lpcolorref); /* Reflected Window Message IDs */

1 0

Alexandre Julliard : include: Use proper dllimports for more wininet functions.
by Alexandre Julliard Nov. 7, 2023

Nov. 7, 2023

Module: wine Branch: master Commit: 9da663b4802dbaff6f80191c09266b1718ce5e15 URL: https://gitlab.winehq.org/wine/wine/-/commit/9da663b4802dbaff6f80191c09266b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 3 17:32:44 2023 +0100 include: Use proper dllimports for more wininet functions. --- include/wininet.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/wininet.h b/include/wininet.h index 158b005d36c..0de2b830812 100644 --- a/include/wininet.h +++ b/include/wininet.h @@ -1742,8 +1742,8 @@ INTERNETAPI BOOL WINAPI InternetSetDialStateW(LPCWSTR ,DWORD ,DWORD); #define InternetSetDialState WINELIB_NAME_AW(InternetSetDialState) #define INTERNET_DIALSTATE_DISCONNECTED 1 -BOOL WINAPI InternetGetConnectedStateExA(LPDWORD, LPSTR, DWORD, DWORD); -BOOL WINAPI InternetGetConnectedStateExW(LPDWORD, LPWSTR, DWORD, DWORD); +INTERNETAPI BOOL WINAPI InternetGetConnectedStateExA(LPDWORD, LPSTR, DWORD, DWORD); +INTERNETAPI BOOL WINAPI InternetGetConnectedStateExW(LPDWORD, LPWSTR, DWORD, DWORD); #define InternetGetConnectedStateEx WINELIB_NAME_AW(InternetGetConnectedStateEx) typedef struct AutoProxyHelperVtbl @@ -1779,8 +1779,8 @@ typedef BOOL (CALLBACK *pfnInternetInitializeAutoProxyDll)(DWORD, LPSTR, LPSTR, #define PROXY_AUTO_DETECT_TYPE_DHCP 1 #define PROXY_AUTO_DETECT_TYPE_DNS_A 2 -BOOL WINAPI InternetInitializeAutoProxyDll(DWORD); -BOOL WINAPI DetectAutoProxyUrl(LPSTR, DWORD, DWORD); +INTERNETAPI BOOL WINAPI InternetInitializeAutoProxyDll(DWORD); +INTERNETAPI BOOL WINAPI DetectAutoProxyUrl(LPSTR, DWORD, DWORD); #ifdef __cplusplus }

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Nov. 7, 2023

Nov. 7, 2023

Module: wine Branch: master Commit: 66dfe504d0b93595677c030ca175657047d391d5 URL: https://gitlab.winehq.org/wine/wine/-/commit/66dfe504d0b93595677c030ca17565… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Tue Nov 7 10:30:44 2023 +0200 po: Update Lithuanian translation. --- po/lt.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/lt.po b/po/lt.po index a4315899021..c71d0fd13e7 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2023-10-11 23:56+0300\n" +"PO-Revision-Date: 2023-11-07 09:32+0200\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -18539,10 +18539,8 @@ msgid "MIME types" msgstr "MIME tipai" #: programs/winecfg/winecfg.rc:311 -#, fuzzy -#| msgid "Manage file &associations" msgid "Manage file and protocol &associations" -msgstr "Valdyti failų susie&jimus" +msgstr "Valdyti failų ir protokolų susie&jimus" #: programs/winecfg/winecfg.rc:314 msgid "Folders"

1 0

Alexandre Julliard : include: Use proper dllimports for slc functions.
by Alexandre Julliard Nov. 7, 2023

Nov. 7, 2023

Module: wine Branch: master Commit: 32cdd5d487e9223664adadbb775d75b022aec29c URL: https://gitlab.winehq.org/wine/wine/-/commit/32cdd5d487e9223664adadbb775d75… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 3 17:30:27 2023 +0100 include: Use proper dllimports for slc functions. --- dlls/sppc/Makefile.in | 1 + include/slpublic.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/sppc/Makefile.in b/dlls/sppc/Makefile.in index 81a59392c62..e9209fe4b71 100644 --- a/dlls/sppc/Makefile.in +++ b/dlls/sppc/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -D_SLC_ MODULE = sppc.dll EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/include/slpublic.h b/include/slpublic.h index 3f3a39274d1..97fa8c798c9 100644 --- a/include/slpublic.h +++ b/include/slpublic.h @@ -26,7 +26,7 @@ extern "C" { #ifdef _SLC_ #define SLCAPI #else -#define SLCAPI DECLSPEC_HIDDEN +#define SLCAPI DECLSPEC_IMPORT #endif typedef GUID SLID;

1 0

Alexandre Julliard : include: Use proper dllimports for winscard functions.
by Alexandre Julliard Nov. 7, 2023

Nov. 7, 2023

Module: wine Branch: master Commit: e7f44130ebdeaf9ec4cbbeb7d0ed9cc3854c0c94 URL: https://gitlab.winehq.org/wine/wine/-/commit/e7f44130ebdeaf9ec4cbbeb7d0ed9c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 3 17:29:45 2023 +0100 include: Use proper dllimports for winscard functions. --- dlls/winscard/winscard.c | 1 + include/winscard.h | 156 ++++++++++++++++++++++++----------------------- 2 files changed, 81 insertions(+), 76 deletions(-)

1 0

Zebediah Figura : d3d11/tests: Do not test GSInvocations in test_pipeline_statistics_query().
by Alexandre Julliard Nov. 7, 2023

Nov. 7, 2023

Module: wine Branch: master Commit: 1240b275436c1cf71745efc4fb5be364972a0af7 URL: https://gitlab.winehq.org/wine/wine/-/commit/1240b275436c1cf71745efc4fb5be3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 26 13:52:01 2023 -0500 d3d11/tests: Do not test GSInvocations in test_pipeline_statistics_query(). --- dlls/d3d11/tests/d3d11.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 91e7e42b31b..d16a1088732 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -6199,8 +6199,7 @@ static void test_pipeline_statistics_query(void) ok(data.IAVertices == 4, "Got unexpected IAVertices count: %u.\n", (unsigned int)data.IAVertices); ok(data.IAPrimitives == 2, "Got unexpected IAPrimitives count: %u.\n", (unsigned int)data.IAPrimitives); ok(data.VSInvocations == 4, "Got unexpected VSInvocations count: %u.\n", (unsigned int)data.VSInvocations); - todo_wine_if (damavand) - ok(!data.GSInvocations, "Got unexpected GSInvocations count: %u.\n", (unsigned int)data.GSInvocations); + /* AMD has nonzero GSInvocations on Windows. */ ok(!data.GSPrimitives, "Got unexpected GSPrimitives count: %u.\n", (unsigned int)data.GSPrimitives); ok(data.CInvocations == 2, "Got unexpected CInvocations count: %u.\n", (unsigned int)data.CInvocations); ok(data.CPrimitives == 2, "Got unexpected CPrimitives count: %u.\n", (unsigned int)data.CPrimitives); @@ -6222,8 +6221,7 @@ static void test_pipeline_statistics_query(void) ok(data.IAVertices == 4, "Got unexpected IAVertices count: %u.\n", (unsigned int)data.IAVertices); ok(data.IAPrimitives == 2, "Got unexpected IAPrimitives count: %u.\n", (unsigned int)data.IAPrimitives); ok(data.VSInvocations == 4, "Got unexpected VSInvocations count: %u.\n", (unsigned int)data.VSInvocations); - todo_wine_if (damavand) - ok(!data.GSInvocations, "Got unexpected GSInvocations count: %u.\n", (unsigned int)data.GSInvocations); + /* AMD has nonzero GSInvocations on Windows. */ ok(!data.GSPrimitives, "Got unexpected GSPrimitives count: %u.\n", (unsigned int)data.GSPrimitives); ok(data.CInvocations == 2, "Got unexpected CInvocations count: %u.\n", (unsigned int)data.CInvocations); ok(data.CPrimitives == 2, "Got unexpected CPrimitives count: %u.\n", (unsigned int)data.CPrimitives);

1 0

Zebediah Figura : d3d8/tests: Do not test sysmem textures in test_mipmap_upload().
by Alexandre Julliard Nov. 7, 2023

Nov. 7, 2023

Module: wine Branch: master Commit: 8141f89374437d4d218f36a3484f9bbcfa238568 URL: https://gitlab.winehq.org/wine/wine/-/commit/8141f89374437d4d218f36a3484f9b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 26 13:44:11 2023 -0500 d3d8/tests: Do not test sysmem textures in test_mipmap_upload(). This does not work reliably on Windows. The application in question uses a managed texture. --- dlls/d3d8/tests/visual.c | 76 ++++++++++++++++++++---------------------------- 1 file changed, 31 insertions(+), 45 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 5cb422b7525..88bbaebb033 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -12129,11 +12129,11 @@ static void test_managed_reset(void) release_test_context(&context); } -/* Some applications lock a mipmapped texture at level 0, write every level at - * once, and expect it to be uploaded. */ +/* Some applications (Vivisector, Cryostasis) lock a mipmapped managed texture + * at level 0, write every level at once, and expect it to be uploaded. */ static void test_mipmap_upload(void) { - unsigned int i, j, width, level_count; + unsigned int j, width, level_count; struct d3d8_test_context context; IDirect3DTexture8 *texture; D3DLOCKED_RECT locked_rect; @@ -12141,64 +12141,50 @@ static void test_mipmap_upload(void) unsigned int *mem; HRESULT hr; - static const D3DPOOL pools[] = - { - D3DPOOL_MANAGED, - D3DPOOL_SYSTEMMEM, - }; - if (!init_test_context(&context)) return; device = context.device; - for (i = 0; i < ARRAY_SIZE(pools); ++i) - { - winetest_push_context("pool %#x", pools[i]); - - hr = IDirect3DDevice8_CreateTexture(device, 32, 32, 0, 0, - D3DFMT_A8R8G8B8, pools[i], &texture); - ok(hr == S_OK, "Got hr %#lx.\n", hr); - - level_count = IDirect3DBaseTexture8_GetLevelCount(texture); - - hr = IDirect3DTexture8_LockRect(texture, 0, &locked_rect, NULL, 0); - ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice8_CreateTexture(device, 32, 32, 0, 0, + D3DFMT_A8R8G8B8, D3DPOOL_MANAGED, &texture); + ok(hr == S_OK, "Got hr %#lx.\n", hr); - mem = locked_rect.pBits; + level_count = IDirect3DBaseTexture8_GetLevelCount(texture); - for (j = 0; j < level_count; ++j) - { - width = 32 >> j; - memset(mem, 0x11 * (j + 1), width * width * 4); - mem += width * width; - } + hr = IDirect3DTexture8_LockRect(texture, 0, &locked_rect, NULL, 0); + ok(hr == S_OK, "Got hr %#lx.\n", hr); - hr = IDirect3DTexture8_UnlockRect(texture, 0); - ok(hr == S_OK, "Got hr %#lx.\n", hr); + mem = locked_rect.pBits; - for (j = 0; j < level_count; ++j) - { - winetest_push_context("level %u", j); + for (j = 0; j < level_count; ++j) + { + width = 32 >> j; + memset(mem, 0x11 * (j + 1), width * width * 4); + mem += width * width; + } - hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 0.0, 0); - ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DTexture8_UnlockRect(texture, 0); + ok(hr == S_OK, "Got hr %#lx.\n", hr); - hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_MIPFILTER, D3DTEXF_POINT); - ok(hr == S_OK, "Got hr %#lx.\n", hr); - hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_MAXMIPLEVEL, j); - ok(hr == S_OK, "Got hr %#lx.\n", hr); + for (j = 0; j < level_count; ++j) + { + winetest_push_context("level %u", j); - draw_textured_quad(&context, texture); - /* AMD Windows drivers don't sample from sysmem textures. */ - check_rt_color_broken(context.backbuffer, 0x00111111 * (j + 1), 0x00000000, pools[i] == D3DPOOL_SYSTEMMEM); + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 0.0, 0); + ok(hr == S_OK, "Got hr %#lx.\n", hr); - winetest_pop_context(); - } + hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_MIPFILTER, D3DTEXF_POINT); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_MAXMIPLEVEL, j); + ok(hr == S_OK, "Got hr %#lx.\n", hr); - IDirect3DTexture8_Release(texture); + draw_textured_quad(&context, texture); + check_rt_color(context.backbuffer, 0x00111111 * (j + 1)); winetest_pop_context(); } + + IDirect3DTexture8_Release(texture); release_test_context(&context); }

1 0

Zebediah Figura : d3d10core/tests: Do not test GSInvocations in test_pipeline_statistics_query().
by Alexandre Julliard Nov. 7, 2023

Nov. 7, 2023

Module: wine Branch: master Commit: 10334ab457c926f6ad07add9a1fe439c30ba0367 URL: https://gitlab.winehq.org/wine/wine/-/commit/10334ab457c926f6ad07add9a1fe43… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 26 13:51:57 2023 -0500 d3d10core/tests: Do not test GSInvocations in test_pipeline_statistics_query(). --- dlls/d3d10core/tests/d3d10core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index e885b8678bf..8db3b1abff6 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -4915,7 +4915,7 @@ static void test_pipeline_statistics_query(void) ok(data.IAVertices == 4, "Got unexpected IAVertices count: %u.\n", (unsigned int)data.IAVertices); ok(data.IAPrimitives == 2, "Got unexpected IAPrimitives count: %u.\n", (unsigned int)data.IAPrimitives); ok(data.VSInvocations == 4, "Got unexpected VSInvocations count: %u.\n", (unsigned int)data.VSInvocations); - todo_wine_if (damavand) ok(!data.GSInvocations, "Got unexpected GSInvocations count: %u.\n", (unsigned int)data.GSInvocations); + /* AMD has nonzero GSInvocations on Windows. */ ok(!data.GSPrimitives, "Got unexpected GSPrimitives count: %u.\n", (unsigned int)data.GSPrimitives); ok(data.CInvocations == 2, "Got unexpected CInvocations count: %u.\n", (unsigned int)data.CInvocations); ok(data.CPrimitives == 2, "Got unexpected CPrimitives count: %u.\n", (unsigned int)data.CPrimitives); @@ -4934,7 +4934,7 @@ static void test_pipeline_statistics_query(void) ok(data.IAVertices == 4, "Got unexpected IAVertices count: %u.\n", (unsigned int)data.IAVertices); ok(data.IAPrimitives == 2, "Got unexpected IAPrimitives count: %u.\n", (unsigned int)data.IAPrimitives); ok(data.VSInvocations == 4, "Got unexpected VSInvocations count: %u.\n", (unsigned int)data.VSInvocations); - todo_wine_if (damavand) ok(!data.GSInvocations, "Got unexpected GSInvocations count: %u.\n", (unsigned int)data.GSInvocations); + /* AMD has nonzero GSInvocations on Windows. */ ok(!data.GSPrimitives, "Got unexpected GSPrimitives count: %u.\n", (unsigned int)data.GSPrimitives); ok(data.CInvocations == 2, "Got unexpected CInvocations count: %u.\n", (unsigned int)data.CInvocations); ok(data.CPrimitives == 2, "Got unexpected CPrimitives count: %u.\n", (unsigned int)data.CPrimitives);

1 0