wine-commits September 2019

wine-commits@winehq.org

2 participants
629 discussions

Henri Verbeet : wined3d: Retrieve the supported sample counts for Vulkan formats.
by Alexandre Julliard 20 Sep '19

20 Sep '19

Module: wine Branch: master Commit: c84b48b770a33d9839094c5944f2a29363068110 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c84b48b770a33d9839094c59… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 20 18:26:29 2019 +0430 wined3d: Retrieve the supported sample counts for Vulkan formats. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 82027bf19c..cc217c7322 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4160,10 +4160,13 @@ static void init_vulkan_format_info(struct wined3d_format_vk *format, {WINED3DFMT_BC7_UNORM_SRGB, VK_FORMAT_BC7_SRGB_BLOCK, }, }; VkFormat vk_format = VK_FORMAT_UNDEFINED; + VkImageFormatProperties image_properties; VkFormatFeatureFlags texture_flags; VkFormatProperties properties; + VkImageUsageFlags vk_usage; unsigned int flags; unsigned int i; + VkResult vr; for (i = 0; i < ARRAY_SIZE(vulkan_formats); ++i) { @@ -4211,6 +4214,22 @@ static void init_vulkan_format_info(struct wined3d_format_vk *format, format->f.flags[WINED3D_GL_RES_TYPE_TEX_2D] |= flags; format->f.flags[WINED3D_GL_RES_TYPE_TEX_3D] |= flags; format->f.flags[WINED3D_GL_RES_TYPE_TEX_CUBE] |= flags; + + vk_usage = 0; + if (texture_flags & VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT) + vk_usage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; + else if (texture_flags & VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT) + vk_usage = VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT; + if (vk_usage) + { + if ((vr = VK_CALL(vkGetPhysicalDeviceImageFormatProperties(vk_physical_device, vk_format, + VK_IMAGE_TYPE_2D, VK_IMAGE_TILING_OPTIMAL, vk_usage, 0, &image_properties))) < 0) + { + ERR("Failed to get image format properties, vr %s.\n", wined3d_debug_vkresult(vr)); + return; + } + format->f.multisample_types = image_properties.sampleCounts; + } } BOOL wined3d_adapter_vk_init_format_info(struct wined3d_adapter_vk *adapter_vk,

1 0

Henri Verbeet : wined3d: Explicitly initialise sRGB format info.
by Alexandre Julliard 20 Sep '19

20 Sep '19

Module: wine Branch: master Commit: 59ef897514cf72ec374c6738da910b43aec1256a URL: https://source.winehq.org/git/wine.git/?a=commit;h=59ef897514cf72ec374c6738… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 20 18:26:28 2019 +0430 wined3d: Explicitly initialise sRGB format info. For the GL adapter this already happens implicitly in init_format_texture_info(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index e10d617b4e..82027bf19c 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2171,6 +2171,24 @@ static BOOL init_format_decompress_info(struct wined3d_adapter *adapter) return TRUE; } +static BOOL init_srgb_formats(struct wined3d_adapter *adapter) +{ + struct wined3d_format *format, *srgb_format; + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(format_srgb_info); ++i) + { + if (!(srgb_format = get_format_internal(adapter, format_srgb_info[i].srgb_format_id))) + return FALSE; + if (!(format = get_format_internal(adapter, format_srgb_info[i].base_format_id))) + return FALSE; + + copy_format(adapter, srgb_format, format); + } + + return TRUE; +} + static GLenum wined3d_gl_type_to_enum(enum wined3d_gl_resource_type type) { switch (type) @@ -3990,6 +4008,8 @@ static BOOL wined3d_adapter_init_format_info(struct wined3d_adapter *adapter, si goto fail; if (!init_format_decompress_info(adapter)) goto fail; + if (!init_srgb_formats(adapter)) + goto fail; return TRUE;

1 0

Henri Verbeet : wined3d: More accurately determine whether a separate sRGB texture is required.
by Alexandre Julliard 20 Sep '19

20 Sep '19

Module: wine Branch: master Commit: 74dc66ca576b741d405e20b457e7a509baba7973 URL: https://source.winehq.org/git/wine.git/?a=commit;h=74dc66ca576b741d405e20b4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 20 18:26:27 2019 +0430 wined3d: More accurately determine whether a separate sRGB texture is required. Read control is irrelevant without WINED3D_BIND_SHADER_RESOURCE, write control is irrelevant without WINED3D_BIND_RENDER_TARGET. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/wined3d_private.h | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1d30cb315c..58977f8cd1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5077,12 +5077,20 @@ static inline BOOL is_srgb_enabled(const DWORD *sampler_states) static inline BOOL needs_separate_srgb_gl_texture(const struct wined3d_context *context, const struct wined3d_texture *texture) { - unsigned int flags = texture->resource.format_flags - & (WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE); + if (!(context->d3d_info->wined3d_creation_flags & WINED3D_SRGB_READ_WRITE_CONTROL)) + return FALSE; + + if (!context->d3d_info->srgb_read_control + && (texture->resource.bind_flags & WINED3D_BIND_SHADER_RESOURCE) + && (texture->resource.format_flags & WINED3DFMT_FLAG_SRGB_READ)) + return TRUE; - return (!context->d3d_info->srgb_read_control - || (flags && flags != (WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE))) - && context->d3d_info->wined3d_creation_flags & WINED3D_SRGB_READ_WRITE_CONTROL; + if (!context->d3d_info->srgb_write_control + && (texture->resource.bind_flags & WINED3D_BIND_RENDER_TARGET) + && (texture->resource.format_flags & WINED3DFMT_FLAG_SRGB_WRITE)) + return TRUE; + + return FALSE; } static inline BOOL needs_srgb_write(const struct wined3d_context *context,

1 0

Henri Verbeet : wined3d: Add GPU information for AMD VEGA12.
by Alexandre Julliard 20 Sep '19

20 Sep '19

Module: wine Branch: master Commit: d00477e5ea45faae7f087646bdb6784be4b368a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d00477e5ea45faae7f087646… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 20 18:26:26 2019 +0430 wined3d: Add GPU information for AMD VEGA12. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index fd03ce6349..8cb83ee884 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -398,6 +398,7 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_460, "Radeon(TM) RX 460 Graphics", DRIVER_AMD_RX, 4096}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_480, "Radeon (TM) RX 480 Graphics", DRIVER_AMD_RX, 4096}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA_10, "Radeon RX Vega", DRIVER_AMD_RX, 8192}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA_12, "Radeon Pro Vega 20", DRIVER_AMD_RX, 4096}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA_20, "Radeon RX Vega 20", DRIVER_AMD_RX, 4096}, /* Red Hat */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 10d076edcc..1d30cb315c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2413,6 +2413,7 @@ enum wined3d_pci_device CARD_AMD_RADEON_RX_460 = 0x67ef, CARD_AMD_RADEON_RX_480 = 0x67df, CARD_AMD_RADEON_RX_VEGA_10 = 0x687f, + CARD_AMD_RADEON_RX_VEGA_12 = 0x69af, CARD_AMD_RADEON_RX_VEGA_20 = 0x66af, CARD_NVIDIA_RIVA_128 = 0x0018,

1 0

Hans Leidekker : wbemprox: Implement Win32_DisplayControllerConfiguration.
by Alexandre Julliard 20 Sep '19

20 Sep '19

Module: wine Branch: master Commit: 31c0cb48622ae869cfc358be8531821ec1eda7b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=31c0cb48622ae869cfc358be… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Sep 20 13:37:15 2019 +0200 wbemprox: Implement Win32_DisplayControllerConfiguration. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47782 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 73 +++++++++++++++++++++++++++++++++++++-------- dlls/wbemprox/tests/query.c | 44 +++++++++++++++++++++++++++ 2 files changed, 104 insertions(+), 13 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 94f077a7c4..2aca2f8693 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -74,6 +74,9 @@ static const WCHAR class_diskdrivetodiskpartitionW[] = {'W','i','n','3','2','_','D','i','s','k','D','r','i','v','e','T','o','D','i','s','k','P','a','r','t','i','t','i','o','n',0}; static const WCHAR class_diskpartitionW[] = {'W','i','n','3','2','_','D','i','s','k','P','a','r','t','i','t','i','o','n',0}; +static const WCHAR class_displaycontrollerconfigW[] = + {'W','i','n','3','2','_','D','i','s','p','l','a','y','C','o','n','t','r','o','l','l','e','r', + 'C','o','n','f','i','g','u','r','a','t','i','o','n',0}; static const WCHAR class_ip4routetableW[] = {'W','i','n','3','2','_','I','P','4','R','o','u','t','e','T','a','b','l','e',0}; static const WCHAR class_logicaldiskW[] = @@ -151,6 +154,8 @@ static const WCHAR prop_availabilityW[] = {'A','v','a','i','l','a','b','i','l','i','t','y',0}; static const WCHAR prop_binaryrepresentationW[] = {'B','i','n','a','r','y','R','e','p','r','e','s','e','n','t','a','t','i','o','n',0}; +static const WCHAR prop_bitsperpixelW[] = + {'B','i','t','s','P','e','r','P','i','x','e','l',0}; static const WCHAR prop_boolvalueW[] = {'B','o','o','l','V','a','l','u','e',0}; static const WCHAR prop_bootableW[] = @@ -445,6 +450,8 @@ static const WCHAR prop_vendorW[] = {'V','e','n','d','o','r',0}; static const WCHAR prop_versionW[] = {'V','e','r','s','i','o','n',0}; +static const WCHAR prop_verticalresolutionW[] = + {'V','e','r','t','i','c','a','l','R','e','s','o','l','u','t','i','o','n',0}; static const WCHAR prop_videoarchitectureW[] = {'V','i','d','e','o','A','r','c','h','i','t','e','c','t','u','r','e',0}; static const WCHAR prop_videomemorytypeW[] = @@ -568,6 +575,14 @@ static const struct column col_diskpartition[] = { prop_startingoffsetW, CIM_UINT64 }, { prop_typeW, CIM_STRING|COL_FLAG_DYNAMIC } }; +static const struct column col_displaycontrollerconfig[] = +{ + { prop_bitsperpixelW, CIM_UINT32 }, + { prop_captionW, CIM_STRING }, + { prop_horizontalresolutionW, CIM_UINT32 }, + { prop_nameW, CIM_STRING|COL_FLAG_KEY }, + { prop_verticalresolutionW, CIM_UINT32 } +}; static const struct column col_ip4routetable[] = { { prop_destinationW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, @@ -1030,6 +1045,14 @@ struct record_diskpartition UINT64 startingoffset; const WCHAR *type; }; +struct record_displaycontrollerconfig +{ + UINT32 bitsperpixel; + const WCHAR *caption; + UINT32 horizontalresolution; + const WCHAR *name; + UINT32 verticalresolution; +}; struct record_ip4routetable { const WCHAR *destination; @@ -2699,6 +2722,41 @@ static enum fill_status fill_diskpartition( struct table *table, const struct ex return status; } +static UINT32 get_bitsperpixel( UINT *hres, UINT *vres ) +{ + HDC hdc = GetDC( NULL ); + UINT32 ret; + + if (!hdc) return 32; + ret = GetDeviceCaps( hdc, BITSPIXEL ); + *hres = GetDeviceCaps( hdc, HORZRES ); + *vres = GetDeviceCaps( hdc, VERTRES ); + ReleaseDC( NULL, hdc ); + return ret; +} + +static enum fill_status fill_displaycontrollerconfig( struct table *table, const struct expr *cond ) +{ + struct record_displaycontrollerconfig *rec; + UINT row = 0, hres = 1024, vres = 768; + enum fill_status status = FILL_STATUS_UNFILTERED; + + if (!resize_table( table, 1, sizeof(*rec) )) return FILL_STATUS_FAILED; + + rec = (struct record_displaycontrollerconfig *)table->data; + rec->bitsperpixel = get_bitsperpixel( &hres, &vres ); + rec->caption = videocontroller_deviceidW; + rec->horizontalresolution = hres; + rec->name = videocontroller_deviceidW; + rec->verticalresolution = vres; + if (!match_row( table, row, cond, &status )) free_row_values( table, row ); + else row++; + + TRACE("created %u rows\n", row); + table->num_rows = row; + return status; +} + static WCHAR *get_ip4_string( DWORD addr ) { static const WCHAR fmtW[] = {'%','u','.','%','u','.','%','u','.','%','u',0}; @@ -4250,18 +4308,6 @@ static enum fill_status fill_systemenclosure( struct table *table, const struct return status; } -static UINT32 get_bits_per_pixel( UINT *hres, UINT *vres ) -{ - HDC hdc = GetDC( NULL ); - UINT32 ret; - - if (!hdc) return 32; - ret = GetDeviceCaps( hdc, BITSPIXEL ); - *hres = GetDeviceCaps( hdc, HORZRES ); - *vres = GetDeviceCaps( hdc, VERTRES ); - ReleaseDC( NULL, hdc ); - return ret; -} static WCHAR *get_pnpdeviceid( DXGI_ADAPTER_DESC *desc ) { static const WCHAR fmtW[] = @@ -4335,7 +4381,7 @@ done: rec->availability = 3; /* Running or Full Power */ rec->config_errorcode = 0; /* no error */ rec->caption = heap_strdupW( name ); - rec->current_bitsperpixel = get_bits_per_pixel( &hres, &vres ); + rec->current_bitsperpixel = get_bitsperpixel( &hres, &vres ); rec->current_horizontalres = hres; rec->current_refreshrate = 0; /* default refresh rate */ rec->current_scanmode = 2; /* Unknown */ @@ -4380,6 +4426,7 @@ static struct table builtin_classes[] = { class_diskdriveW, C(col_diskdrive), 0, 0, NULL, fill_diskdrive }, { class_diskdrivetodiskpartitionW, C(col_diskdrivetodiskpartition), 0, 0, NULL, fill_diskdrivetodiskpartition }, { class_diskpartitionW, C(col_diskpartition), 0, 0, NULL, fill_diskpartition }, + { class_displaycontrollerconfigW, C(col_displaycontrollerconfig), 0, 0, NULL, fill_displaycontrollerconfig }, { class_ip4routetableW, C(col_ip4routetable), 0, 0, NULL, fill_ip4routetable }, { class_logicaldiskW, C(col_logicaldisk), 0, 0, NULL, fill_logicaldisk }, { class_logicaldisk2W, C(col_logicaldisk), 0, 0, NULL, fill_logicaldisk }, diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 81dcd190c4..ee4eac88e9 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1713,6 +1713,49 @@ static void test_Win32_WinSAT( IWbemServices *services ) SysFreeString( wql ); } +static void test_Win32_DisplayControllerConfiguration( IWbemServices *services ) +{ + static const WCHAR bitsperpixelW[] = + {'B','i','t','s','P','e','r','P','i','x','e','l',0}; + static const WCHAR captionW[] = + {'C','a','p','t','i','o','n',0}; + static const WCHAR horizontalresolutionW[] = + {'H','o','r','i','z','o','n','t','a','l','R','e','s','o','l','u','t','i','o','n',0}; + static const WCHAR nameW[] = + {'N','a','m','e',0}; + static const WCHAR queryW[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', + 'D','i','s','p','l','a','y','C','o','n','t','r','o','l','l','e','r', + 'C','o','n','f','i','g','u','r','a','t','i','o','n',0}; + static const WCHAR verticalresolutionW[] = + {'V','e','r','t','i','c','a','l','R','e','s','o','l','u','t','i','o','n',0}; + BSTR wql = SysAllocString( wqlW ), query = SysAllocString( queryW ); + IEnumWbemClassObject *result; + IWbemClassObject *obj; + HRESULT hr; + DWORD count; + + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + ok( hr == S_OK, "got %08x\n", hr ); + + for (;;) + { + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); + if (hr != S_OK) break; + + check_property( obj, bitsperpixelW, VT_I4, CIM_UINT32 ); + check_property( obj, captionW, VT_BSTR, CIM_STRING ); + check_property( obj, horizontalresolutionW, VT_I4, CIM_UINT32 ); + check_property( obj, nameW, VT_BSTR, CIM_STRING ); + check_property( obj, verticalresolutionW, VT_I4, CIM_UINT32 ); + IWbemClassObject_Release( obj ); + } + + IEnumWbemClassObject_Release( result ); + SysFreeString( query ); + SysFreeString( wql ); +} + START_TEST(query) { static const WCHAR cimv2W[] = {'R','O','O','T','\\','C','I','M','V','2',0}; @@ -1752,6 +1795,7 @@ START_TEST(query) test_Win32_ComputerSystem( services ); test_Win32_ComputerSystemProduct( services ); test_Win32_Bios( services ); + test_Win32_DisplayControllerConfiguration( services ); test_Win32_IP4RouteTable( services ); test_Win32_OperatingSystem( services ); test_Win32_PhysicalMemory( services );

1 0

Nikolay Sivov : d3d11/tests: Add a test for creating SRV for resource without D3D11_BIND_SHADER_RESOURCE.
by Alexandre Julliard 20 Sep '19

20 Sep '19

Module: wine Branch: master Commit: 01d2125078e47a71d9a5aac8ec5248b0f6db2178 URL: https://source.winehq.org/git/wine.git/?a=commit;h=01d2125078e47a71d9a5aac8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 20 11:39:35 2019 +0300 d3d11/tests: Add a test for creating SRV for resource without D3D11_BIND_SHADER_RESOURCE. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 1d7a7c7fe7..97ab9b4487 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -4256,6 +4256,17 @@ static void test_create_shader_resource_view(void) ID3D11ShaderResourceView_Release(srview); ID3D11Buffer_Release(buffer); + /* Without D3D11_BIND_SHADER_RESOURCE. */ + buffer = create_buffer(device, 0, 1024, NULL); + + hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)buffer, &srv_desc, &srview); +todo_wine + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + ID3D11ShaderResourceView_Release(srview); + + ID3D11Buffer_Release(buffer); + if (feature_level >= D3D_FEATURE_LEVEL_11_0) { buffer_desc.ByteWidth = 1024;

1 0

Nikolay Sivov : d3d10core/tests: Add a test for creating SRV for resource without D3D10_BIND_SHADER_RESOURCE.
by Alexandre Julliard 20 Sep '19

20 Sep '19

Module: wine Branch: master Commit: 2515c08bb6532dff5fe30370d1463c8afb7e1e67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2515c08bb6532dff5fe30370… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 20 11:39:34 2019 +0300 d3d10core/tests: Add a test for creating SRV for resource without D3D10_BIND_SHADER_RESOURCE. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index f65bd34a79..cc6b39ccd1 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -3578,6 +3578,17 @@ static void test_create_shader_resource_view(void) ID3D10ShaderResourceView_Release(srview); ID3D10Buffer_Release(buffer); + /* Without D3D10_BIND_SHADER_RESOURCE. */ + buffer = create_buffer(device, 0, 1024, NULL); + + hr = ID3D10Device_CreateShaderResourceView(device, (ID3D10Resource *)buffer, &srv_desc, &srview); +todo_wine + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + ID3D10ShaderResourceView_Release(srview); + + ID3D10Buffer_Release(buffer); + texture2d_desc.Width = 512; texture2d_desc.Height = 512; texture2d_desc.SampleDesc.Count = 1;

1 0

Nikolay Sivov : d3d10_1/tests: Add a test for creating SRV for resource without D3D10_BIND_SHADER_RESOURCE.
by Alexandre Julliard 20 Sep '19

20 Sep '19

Module: wine Branch: master Commit: dcba4ab5329de5140738f487dc16cc5ec7da3a5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=dcba4ab5329de5140738f487… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 20 11:39:33 2019 +0300 d3d10_1/tests: Add a test for creating SRV for resource without D3D10_BIND_SHADER_RESOURCE. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10_1/tests/d3d10_1.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/d3d10_1/tests/d3d10_1.c b/dlls/d3d10_1/tests/d3d10_1.c index f6abea0ced..9c468c13a2 100644 --- a/dlls/d3d10_1/tests/d3d10_1.c +++ b/dlls/d3d10_1/tests/d3d10_1.c @@ -399,6 +399,24 @@ static void test_create_shader_resource_view(void) ID3D10ShaderResourceView1_Release(srview); ID3D10Buffer_Release(buffer); + /* Without D3D10_BIND_SHADER_RESOURCE. */ + buffer_desc.ByteWidth = 1024; + buffer_desc.Usage = D3D10_USAGE_DEFAULT; + buffer_desc.BindFlags = 0; + buffer_desc.CPUAccessFlags = 0; + buffer_desc.MiscFlags = 0; + + hr = ID3D10Device1_CreateBuffer(device, &buffer_desc, NULL, &buffer); + ok(SUCCEEDED(hr), "Failed to create a buffer, hr %#x\n", hr); + + hr = ID3D10Device1_CreateShaderResourceView1(device, (ID3D10Resource *)buffer, &srv_desc, &srview); +todo_wine + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + ID3D10ShaderResourceView1_Release(srview); + + ID3D10Buffer_Release(buffer); + texture_desc.Width = 512; texture_desc.Height = 512; texture_desc.MipLevels = 0;

1 0

Alex Henrie : wined3d: Avoid dead assignment (scan-build).
by Alexandre Julliard 20 Sep '19

20 Sep '19

Module: wine Branch: master Commit: 6c40c2dab2fcf587d89665369ff64786b07cfdb2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c40c2dab2fcf587d8966536… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Sep 15 23:40:42 2019 -0600 wined3d: Avoid dead assignment (scan-build). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 1 - dlls/wined3d/surface.c | 1 - 2 files changed, 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 76c3f9fc99..0e0977e1d4 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -10021,7 +10021,6 @@ static HRESULT shader_glsl_compile_compute_shader(struct shader_glsl_priv *priv, return E_OUTOFMEMORY; } shader_data = shader->backend_data; - gl_shaders = shader_data->gl_shaders.cs; if (!(shader_data->gl_shaders.cs = heap_alloc(sizeof(*gl_shaders)))) { diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d254e904f8..4a3ecf9863 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1285,7 +1285,6 @@ static void ffp_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_de if (previous && (previous->width != view->width || previous->height != view->height)) have_identical_size = FALSE; - previous = view; } if (have_identical_size)

1 0

Michael Müller : wine.inf: Create the WindowsMediaVersion key and set its default value.
by Alexandre Julliard 20 Sep '19

20 Sep '19

Module: wine Branch: master Commit: acd5358f5bb7c2dd491f7490849a410634971a3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=acd5358f5bb7c2dd491f7490… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Sep 19 18:36:40 2019 -0500 wine.inf: Create the WindowsMediaVersion key and set its default value. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47779 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 3ddda8d5aa..f469703e71 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -498,6 +498,7 @@ HKLM,%CurrentVersion%\PreviewHandlers,,16 HKLM,%CurrentVersion%\Run,,16 HKLM,%CurrentVersion%\Setup,"BootDir",,"%30%" HKLM,%CurrentVersion%\Setup,"SharedDir",,"%25%" +HKLM,%CurrentVersion%\Setup\WindowsFeatures\WindowsMediaVersion,,,"12.0.7601.18840" HKLM,%CurrentVersion%\Shell Extensions\Approved,,16 HKLM,%CurrentVersion%\Uninstall,,16 HKLM,%CurrentVersion%\Winlogon,,16

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
63
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 September 2019