September 2018 - Wine-devel

[PATCH 2/4] wined3d: Handle lack of ARB_half_float_vertex in format_vertex_info[].
by Henri Verbeet 13 Sep '18

13 Sep '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/utils.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 0c230da878d..3a74fc8f281 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -624,8 +624,11 @@ static const struct wined3d_format_vertex_info format_vertex_info[] = {WINED3DFMT_R10G10B10X2_SNORM, WINED3D_FFP_EMIT_DEC3N, GL_SHORT}, {WINED3DFMT_R10G10B10A2_UNORM, WINED3D_FFP_EMIT_INVALID, GL_UNSIGNED_INT_2_10_10_10_REV, ARB_VERTEX_TYPE_2_10_10_10_REV}, - {WINED3DFMT_R16G16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_2, GL_HALF_FLOAT}, - {WINED3DFMT_R16G16B16A16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_4, GL_HALF_FLOAT}, + /* Without ARB_half_float_vertex we convert these on upload. */ + {WINED3DFMT_R16G16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_2, GL_FLOAT}, + {WINED3DFMT_R16G16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_2, GL_HALF_FLOAT, ARB_HALF_FLOAT_VERTEX}, + {WINED3DFMT_R16G16B16A16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_4, GL_FLOAT}, + {WINED3DFMT_R16G16B16A16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_4, GL_HALF_FLOAT, ARB_HALF_FLOAT_VERTEX}, {WINED3DFMT_R8G8B8A8_SNORM, WINED3D_FFP_EMIT_INVALID, GL_BYTE}, {WINED3DFMT_R8G8B8A8_SINT, WINED3D_FFP_EMIT_INVALID, GL_BYTE}, {WINED3DFMT_R16G16B16A16_UINT, WINED3D_FFP_EMIT_INVALID, GL_UNSIGNED_SHORT}, @@ -3556,17 +3559,6 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ format->color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_P8); } - if (!gl_info->supported[ARB_HALF_FLOAT_VERTEX]) - { - /* Do not change the size of the type, it is CPU side. We have to change the GPU-side information though. - * It is the job of the vertex buffer code to make sure that the vbos have the right format */ - format = get_format_internal(adapter, WINED3DFMT_R16G16_FLOAT); - format->gl_vtx_type = GL_FLOAT; - - format = get_format_internal(adapter, WINED3DFMT_R16G16B16A16_FLOAT); - format->gl_vtx_type = GL_FLOAT; - } - if (!gl_info->supported[ARB_HALF_FLOAT_PIXEL]) { format = get_format_internal(adapter, WINED3DFMT_R16_FLOAT); -- 2.11.0

1 0

[v2 PATCH 1/2] d2d1: Return bitmap options.
by Nikolay Sivov 13 Sep '18

13 Sep '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/bitmap.c | 43 ++++++++++------ dlls/d2d1/d2d1_private.h | 7 +-- dlls/d2d1/device.c | 39 +++++++++++--- dlls/d2d1/tests/d2d1.c | 108 +++++++++++++++++++++------------------ 4 files changed, 121 insertions(+), 76 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index 8282dca043..79dbabbea9 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -179,9 +179,11 @@ static void STDMETHODCALLTYPE d2d_bitmap_GetColorContext(ID2D1Bitmap1 *iface, ID static D2D1_BITMAP_OPTIONS STDMETHODCALLTYPE d2d_bitmap_GetOptions(ID2D1Bitmap1 *iface) { - FIXME("iface %p stub!\n", iface); + struct d2d_bitmap *bitmap = impl_from_ID2D1Bitmap1(iface); + + TRACE("iface %p.\n", iface); - return D2D1_BITMAP_OPTIONS_NONE; + return bitmap->options; } static HRESULT STDMETHODCALLTYPE d2d_bitmap_GetSurface(ID2D1Bitmap1 *iface, IDXGISurface **surface) @@ -262,7 +264,7 @@ static BOOL format_supported(const D2D1_PIXEL_FORMAT *format) } static void d2d_bitmap_init(struct d2d_bitmap *bitmap, ID2D1Factory *factory, - ID3D10ShaderResourceView *view, D2D1_SIZE_U size, const D2D1_BITMAP_PROPERTIES *desc) + ID3D10ShaderResourceView *view, D2D1_SIZE_U size, const D2D1_BITMAP_PROPERTIES1 *desc) { bitmap->ID2D1Bitmap1_iface.lpVtbl = &d2d_bitmap_vtbl; bitmap->refcount = 1; @@ -272,6 +274,7 @@ static void d2d_bitmap_init(struct d2d_bitmap *bitmap, ID2D1Factory *factory, bitmap->format = desc->pixelFormat; bitmap->dpi_x = desc->dpiX; bitmap->dpi_y = desc->dpiY; + bitmap->options = desc->bitmapOptions; if (bitmap->dpi_x == 0.0f && bitmap->dpi_y == 0.0f) { @@ -281,7 +284,7 @@ static void d2d_bitmap_init(struct d2d_bitmap *bitmap, ID2D1Factory *factory, } HRESULT d2d_bitmap_create(ID2D1Factory *factory, ID3D10Device *device, D2D1_SIZE_U size, const void *src_data, - UINT32 pitch, const D2D1_BITMAP_PROPERTIES *desc, struct d2d_bitmap **bitmap) + UINT32 pitch, const D2D1_BITMAP_PROPERTIES1 *desc, struct d2d_bitmap **bitmap) { D3D10_SUBRESOURCE_DATA resource_data; D3D10_TEXTURE2D_DESC texture_desc; @@ -338,9 +341,9 @@ HRESULT d2d_bitmap_create(ID2D1Factory *factory, ID3D10Device *device, D2D1_SIZE } HRESULT d2d_bitmap_create_shared(ID2D1DeviceContext *context, ID3D10Device *target_device, - REFIID iid, void *data, const D2D1_BITMAP_PROPERTIES *desc, struct d2d_bitmap **bitmap) + REFIID iid, void *data, const D2D1_BITMAP_PROPERTIES1 *desc, struct d2d_bitmap **bitmap) { - D2D1_BITMAP_PROPERTIES d; + D2D1_BITMAP_PROPERTIES1 d; ID2D1Factory *factory; if (IsEqualGUID(iid, &IID_ID2D1Bitmap)) @@ -432,7 +435,22 @@ HRESULT d2d_bitmap_create_shared(ID2D1DeviceContext *context, ID3D10Device *targ return E_OUTOFMEMORY; } - d = *desc; + + if (FAILED(hr = IDXGISurface_GetDesc(surface, &surface_desc))) + { + WARN("Failed to get surface desc, hr %#x.\n", hr); + ID3D10ShaderResourceView_Release(view); + return hr; + } + + if (!desc) + { + memset(&d, 0, sizeof(d)); + d.pixelFormat.format = surface_desc.Format; + } + else + d = *desc; + if (d.dpiX == 0.0f || d.dpiY == 0.0f) { float dpi_x, dpi_y; @@ -444,13 +462,6 @@ HRESULT d2d_bitmap_create_shared(ID2D1DeviceContext *context, ID3D10Device *targ d.dpiY = dpi_y; } - if (FAILED(hr = IDXGISurface_GetDesc(surface, &surface_desc))) - { - WARN("Failed to get surface desc, hr %#x.\n", hr); - ID3D10ShaderResourceView_Release(view); - return hr; - } - pixel_size.width = surface_desc.Width; pixel_size.height = surface_desc.Height; @@ -469,10 +480,10 @@ HRESULT d2d_bitmap_create_shared(ID2D1DeviceContext *context, ID3D10Device *targ } HRESULT d2d_bitmap_create_from_wic_bitmap(ID2D1Factory *factory, ID3D10Device *device, IWICBitmapSource *bitmap_source, - const D2D1_BITMAP_PROPERTIES *desc, struct d2d_bitmap **bitmap) + const D2D1_BITMAP_PROPERTIES1 *desc, struct d2d_bitmap **bitmap) { const D2D1_PIXEL_FORMAT *d2d_format; - D2D1_BITMAP_PROPERTIES bitmap_desc; + D2D1_BITMAP_PROPERTIES1 bitmap_desc; WICPixelFormatGUID wic_format; unsigned int bpp, data_size; D2D1_SIZE_U size; diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 4148a685ba..5f83f8fde2 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -343,14 +343,15 @@ struct d2d_bitmap D2D1_PIXEL_FORMAT format; float dpi_x; float dpi_y; + D2D1_BITMAP_OPTIONS options; }; HRESULT d2d_bitmap_create(ID2D1Factory *factory, ID3D10Device *device, D2D1_SIZE_U size, const void *src_data, - UINT32 pitch, const D2D1_BITMAP_PROPERTIES *desc, struct d2d_bitmap **bitmap) DECLSPEC_HIDDEN; + UINT32 pitch, const D2D1_BITMAP_PROPERTIES1 *desc, struct d2d_bitmap **bitmap) DECLSPEC_HIDDEN; HRESULT d2d_bitmap_create_shared(ID2D1DeviceContext *context, ID3D10Device *device, REFIID iid, void *data, - const D2D1_BITMAP_PROPERTIES *desc, struct d2d_bitmap **bitmap) DECLSPEC_HIDDEN; + const D2D1_BITMAP_PROPERTIES1 *desc, struct d2d_bitmap **bitmap) DECLSPEC_HIDDEN; HRESULT d2d_bitmap_create_from_wic_bitmap(ID2D1Factory *factory, ID3D10Device *device, IWICBitmapSource *bitmap_source, - const D2D1_BITMAP_PROPERTIES *desc, struct d2d_bitmap **bitmap) DECLSPEC_HIDDEN; + const D2D1_BITMAP_PROPERTIES1 *desc, struct d2d_bitmap **bitmap) DECLSPEC_HIDDEN; struct d2d_bitmap *unsafe_impl_from_ID2D1Bitmap(ID2D1Bitmap *iface) DECLSPEC_HIDDEN; struct d2d_state_block diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 4478a19f9f..21092f65c2 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -328,14 +328,23 @@ static void STDMETHODCALLTYPE d2d_device_context_GetFactory(ID2D1DeviceContext * static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateBitmap(ID2D1DeviceContext *iface, D2D1_SIZE_U size, const void *src_data, UINT32 pitch, const D2D1_BITMAP_PROPERTIES *desc, ID2D1Bitmap **bitmap) { - struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); + struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); + D2D1_BITMAP_PROPERTIES1 bitmap_desc; struct d2d_bitmap *object; HRESULT hr; TRACE("iface %p, size {%u, %u}, src_data %p, pitch %u, desc %p, bitmap %p.\n", iface, size.width, size.height, src_data, pitch, desc, bitmap); - if (SUCCEEDED(hr = d2d_bitmap_create(render_target->factory, render_target->device, size, src_data, pitch, desc, &object))) + if (desc) + { + memcpy(&bitmap_desc, desc, sizeof(*desc)); + bitmap_desc.bitmapOptions = 0; + bitmap_desc.colorContext = NULL; + } + + if (SUCCEEDED(hr = d2d_bitmap_create(context->factory, context->device, size, src_data, pitch, + desc ? &bitmap_desc : NULL, &object))) *bitmap = (ID2D1Bitmap *)&object->ID2D1Bitmap1_iface; return hr; @@ -344,15 +353,23 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateBitmap(ID2D1DeviceCont static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateBitmapFromWicBitmap(ID2D1DeviceContext *iface, IWICBitmapSource *bitmap_source, const D2D1_BITMAP_PROPERTIES *desc, ID2D1Bitmap **bitmap) { - struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); + struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); + D2D1_BITMAP_PROPERTIES1 bitmap_desc; struct d2d_bitmap *object; HRESULT hr; TRACE("iface %p, bitmap_source %p, desc %p, bitmap %p.\n", iface, bitmap_source, desc, bitmap); - if (SUCCEEDED(hr = d2d_bitmap_create_from_wic_bitmap(render_target->factory, render_target->device, bitmap_source, - desc, &object))) + if (desc) + { + memcpy(&bitmap_desc, desc, sizeof(*desc)); + bitmap_desc.bitmapOptions = 0; + bitmap_desc.colorContext = NULL; + } + + if (SUCCEEDED(hr = d2d_bitmap_create_from_wic_bitmap(context->factory, context->device, bitmap_source, + desc ? &bitmap_desc : NULL, &object))) *bitmap = (ID2D1Bitmap *)&object->ID2D1Bitmap1_iface; return hr; @@ -361,14 +378,22 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateBitmapFromWicBitmap(ID static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateSharedBitmap(ID2D1DeviceContext *iface, REFIID iid, void *data, const D2D1_BITMAP_PROPERTIES *desc, ID2D1Bitmap **bitmap) { - struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); + struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); + D2D1_BITMAP_PROPERTIES1 bitmap_desc; struct d2d_bitmap *object; HRESULT hr; TRACE("iface %p, iid %s, data %p, desc %p, bitmap %p.\n", iface, debugstr_guid(iid), data, desc, bitmap); - if (SUCCEEDED(hr = d2d_bitmap_create_shared(iface, render_target->device, iid, data, desc, &object))) + if (desc) + { + memcpy(&bitmap_desc, desc, sizeof(*desc)); + bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW; + bitmap_desc.colorContext = NULL; + } + + if (SUCCEEDED(hr = d2d_bitmap_create_shared(iface, context->device, iid, data, desc ? &bitmap_desc : NULL, &object))) *bitmap = (ID2D1Bitmap *)&object->ID2D1Bitmap1_iface; return hr; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index eeae75f841..467d61314d 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -773,6 +773,56 @@ static ID2D1RenderTarget *create_render_target(IDXGISurface *surface) return create_render_target_desc(surface, &desc); } +#define check_bitmap_surface(b, s, o) check_bitmap_surface_(__LINE__, b, s, o) +static void check_bitmap_surface_(unsigned int line, ID2D1Bitmap1 *bitmap, BOOL has_surface, DWORD expected_options) +{ + D2D1_BITMAP_OPTIONS options; + IDXGISurface *surface; + HRESULT hr; + + options = ID2D1Bitmap1_GetOptions(bitmap); + ok_(__FILE__, line)(options == expected_options, "Unexpected bitmap options %#x, expected %#x.\n", + options, expected_options); + + surface = (void *)0xdeadbeef; + hr = ID2D1Bitmap1_GetSurface(bitmap, &surface); + if (has_surface) + { + D3D10_TEXTURE2D_DESC desc; + ID3D10Texture2D *texture; + + todo_wine + ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get bitmap surface, hr %#x.\n", hr); + ok_(__FILE__, line)(!!surface, "Expected surface instance.\n"); + + if (SUCCEEDED(hr)) + { + /* Correlate with resource configuration. */ + hr = IDXGISurface_QueryInterface(surface, &IID_ID3D10Texture2D, (void **)&texture); + ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get texture pointer, hr %#x.\n", hr); + + ID3D10Texture2D_GetDesc(texture, &desc); + ok_(__FILE__, line)(desc.Usage == 0, "Unexpected usage %#x.\n", desc.Usage); + ok_(__FILE__, line)(desc.BindFlags == (options & D2D1_BITMAP_OPTIONS_TARGET ? + D3D10_BIND_RENDER_TARGET : D3D10_BIND_SHADER_RESOURCE), + "Unexpected bind flags %#x, bitmap options %#x.\n", desc.BindFlags, options); + ok_(__FILE__, line)(desc.CPUAccessFlags == 0, "Unexpected cpu access flags %#x.\n", desc.CPUAccessFlags); + ok_(__FILE__, line)(desc.MiscFlags == 0, "Unexpected misc flags %#x.\n", desc.MiscFlags); + + ID3D10Texture2D_Release(texture); + + IDXGISurface_Release(surface); + } + } + else + { + todo_wine { + ok_(__FILE__, line)(hr == D2DERR_INVALID_CALL, "Unexpected hr %#x.\n", hr); + ok_(__FILE__, line)(!surface, "Unexpected surface instance.\n"); + } + } +} + static inline struct geometry_sink *impl_from_ID2D1SimplifiedGeometrySink(ID2D1SimplifiedGeometrySink *iface) { return CONTAINING_RECORD(iface, struct geometry_sink, ID2D1SimplifiedGeometrySink_iface); @@ -4112,11 +4162,19 @@ static void test_shared_bitmap(void) if (SUCCEEDED(hr)) { + ID2D1Bitmap1 *bitmap3; + size = ID2D1Bitmap_GetPixelSize(bitmap2); hr = IDXGISurface_GetDesc(surface2, &surface_desc); ok(SUCCEEDED(hr), "Failed to get surface description, hr %#x.\n", hr); ok(size.width == surface_desc.Width && size.height == surface_desc.Height, "Got wrong bitmap size.\n"); + hr = ID2D1Bitmap_QueryInterface(bitmap2, &IID_ID2D1Bitmap1, (void **)&bitmap3); + ok(SUCCEEDED(hr), "Failed to get ID2D1Bitmap1 pointer, hr %#x.\n", hr); + + check_bitmap_surface(bitmap3, TRUE, D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW); + ID2D1Bitmap1_Release(bitmap3); + ID2D1Bitmap_Release(bitmap2); /* IDXGISurface1 is supported too. */ @@ -6529,56 +6587,6 @@ static void test_create_device(void) ok(!refcount, "Factory has %u references left.\n", refcount); } -#define check_bitmap_surface(b, s, o) check_bitmap_surface_(__LINE__, b, s, o) -static void check_bitmap_surface_(unsigned int line, ID2D1Bitmap1 *bitmap, BOOL has_surface, DWORD expected_options) -{ - D2D1_BITMAP_OPTIONS options; - IDXGISurface *surface; - HRESULT hr; - - options = ID2D1Bitmap1_GetOptions(bitmap); - ok_(__FILE__, line)(options == expected_options, "Unexpected bitmap options %#x, expected %#x.\n", - options, expected_options); - - surface = (void *)0xdeadbeef; - hr = ID2D1Bitmap1_GetSurface(bitmap, &surface); - if (has_surface) - { - D3D10_TEXTURE2D_DESC desc; - ID3D10Texture2D *texture; - - todo_wine - ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get bitmap surface, hr %#x.\n", hr); - ok_(__FILE__, line)(!!surface, "Expected surface instance.\n"); - - if (SUCCEEDED(hr)) - { - /* Correlate with resource configuration. */ - hr = IDXGISurface_QueryInterface(surface, &IID_ID3D10Texture2D, (void **)&texture); - ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get texture pointer, hr %#x.\n", hr); - - ID3D10Texture2D_GetDesc(texture, &desc); - ok_(__FILE__, line)(desc.Usage == 0, "Unexpected usage %#x.\n", desc.Usage); - ok_(__FILE__, line)(desc.BindFlags == (options & D2D1_BITMAP_OPTIONS_TARGET ? - D3D10_BIND_RENDER_TARGET : D3D10_BIND_SHADER_RESOURCE), - "Unexpected bind flags %#x, bitmap options %#x.\n", desc.BindFlags, options); - ok_(__FILE__, line)(desc.CPUAccessFlags == 0, "Unexpected cpu access flags %#x.\n", desc.CPUAccessFlags); - ok_(__FILE__, line)(desc.MiscFlags == 0, "Unexpected misc flags %#x.\n", desc.MiscFlags); - - ID3D10Texture2D_Release(texture); - - IDXGISurface_Release(surface); - } - } - else - { - todo_wine { - ok_(__FILE__, line)(hr == D2DERR_INVALID_CALL, "Unexpected hr %#x.\n", hr); - ok_(__FILE__, line)(!surface, "Unexpected surface instance.\n"); - } - } -} - #define check_rt_bitmap_surface(r, s, o) check_rt_bitmap_surface_(__LINE__, r, s, o) static void check_rt_bitmap_surface_(unsigned int line, ID2D1RenderTarget *rt, BOOL has_surface, DWORD options) { -- 2.18.0

2 2

[PATCH 1/4] wined3d: Move ARB_vertex_array_bgra handling to init_format_vertex_info().
by Henri Verbeet 13 Sep '18

13 Sep '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/utils.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 54b7bceebb9..0c230da878d 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3556,12 +3556,6 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ format->color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_P8); } - if (gl_info->supported[ARB_VERTEX_ARRAY_BGRA]) - { - format = get_format_internal(adapter, WINED3DFMT_B8G8R8A8_UNORM); - format->gl_vtx_format = GL_BGRA; - } - if (!gl_info->supported[ARB_HALF_FLOAT_VERTEX]) { /* Do not change the size of the type, it is CPU side. We have to change the GPU-side information though. @@ -3690,6 +3684,12 @@ static BOOL init_format_vertex_info(const struct wined3d_adapter *adapter, format->gl_vtx_format = format->component_count; } + if (gl_info->supported[ARB_VERTEX_ARRAY_BGRA]) + { + format = get_format_internal(adapter, WINED3DFMT_B8G8R8A8_UNORM); + format->gl_vtx_format = GL_BGRA; + } + return TRUE; } -- 2.11.0

1 0

[PATCH v3 1/2] virtdisk: Add GetStorageDependencyInformation stub.
by Gijs Vermeulen 13 Sep '18

13 Sep '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/virtdisk/virtdisk.spec | 2 +- dlls/virtdisk/virtdisk_main.c | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/virtdisk/virtdisk.spec b/dlls/virtdisk/virtdisk.spec index 2946b66d50..6bd5f146db 100644 --- a/dlls/virtdisk/virtdisk.spec +++ b/dlls/virtdisk/virtdisk.spec @@ -8,7 +8,7 @@ @ stub EnumerateVirtualDiskMetadata @ stub ExpandVirtualDisk @ stub GetAllAttachedVirtualDiskPhysicalPaths -@ stub GetStorageDependencyInformation +@ stdcall GetStorageDependencyInformation(long long long ptr ptr) @ stub GetVirtualDiskInformation @ stub GetVirtualDiskMetadata @ stub GetVirtualDiskOperationProgress diff --git a/dlls/virtdisk/virtdisk_main.c b/dlls/virtdisk/virtdisk_main.c index 0da0dca461..3e6c5c14dc 100644 --- a/dlls/virtdisk/virtdisk_main.c +++ b/dlls/virtdisk/virtdisk_main.c @@ -22,6 +22,8 @@ #include "windef.h" #include "winbase.h" +#include "virtdisk.h" + #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(virtdisk); @@ -44,3 +46,22 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, void *reserved) return TRUE; } + +DWORD WINAPI GetStorageDependencyInformation(HANDLE obj, GET_STORAGE_DEPENDENCY_FLAG flags, ULONG size, STORAGE_DEPENDENCY_INFO *info, ULONG *used) +{ + ULONG temp_size = sizeof(STORAGE_DEPENDENCY_INFO); + + FIXME("(%p, 0x%x, %u, %p, %p): stub\n", obj, flags, size, info, used); + + if (used) *used = temp_size; + + if (!info || !size) + return ERROR_INVALID_PARAMETER; + + if (size < temp_size) + return ERROR_INSUFFICIENT_BUFFER; + + info->NumberEntries = 0; + + return ERROR_SUCCESS; +} -- 2.18.0

1 1

[PATCH vkd3d 8/8] tests: Clear command list before uint tests in test_shader_instructions().
by Józef Kucia 13 Sep '18

13 Sep '18

From: Józef Kucia <jkucia(a)codeweavers.com> Avoids referencing a destroyed render target in the command list. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 85e480c240d9..808562e86127 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -5272,6 +5272,7 @@ static void test_shader_instructions(void) ID3D12CommandQueue *queue; unsigned int i, x, y; ID3D12Resource *cb; + HRESULT hr; static const DWORD ps_div_code[] = { @@ -7392,6 +7393,9 @@ static void test_shader_instructions(void) D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); } + hr = ID3D12GraphicsCommandList_Close(command_list); + ok(hr == S_OK, "Failed to close command list, hr %#x.\n", hr); + reset_command_list(command_list, context.allocator); ID3D12Resource_Release(context.render_target); desc.rt_format = DXGI_FORMAT_R32G32B32A32_UINT; create_render_target(&context, &desc, &context.render_target, &context.rtv); -- 2.16.4

2 1

[PATCH vkd3d 7/8] tests: Add missing resource barrier to test_texture().
by Józef Kucia 13 Sep '18

13 Sep '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 659a5c6a2208..85e480c240d9 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -9203,6 +9203,8 @@ static void test_texture(void) ID3D12Resource_Release(texture); reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); } ID3D12DescriptorHeap_Release(heap); -- 2.16.4

2 1

[PATCH vkd3d 6/8] vkd3d: Partially implement clears for texture UAVs.
by Józef Kucia 13 Sep '18

13 Sep '18

From: Józef Kucia <jkucia(a)codeweavers.com> In the long term, we may want to use shaders to clear UAVs. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 37 +++++++++++++++++++++++++++---------- libs/vkd3d/resource.c | 8 ++++++-- libs/vkd3d/vkd3d_private.h | 16 ++++++++++++++-- 3 files changed, 47 insertions(+), 14 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 5e67e6674e95..decff143d0a3 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3881,6 +3881,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID const struct vkd3d_vk_device_procs *vk_procs; const struct d3d12_desc *cpu_descriptor; struct d3d12_resource *resource_impl; + VkImageSubresourceRange range; + VkClearColorValue color; TRACE("iface %p, gpu_handle %#"PRIx64", cpu_handle %lx, resource %p, values %p, rect_count %u, rects %p.\n", iface, gpu_handle.ptr, cpu_handle.ptr, resource, values, rect_count, rects); @@ -3891,11 +3893,6 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID d3d12_command_list_track_resource_usage(list, resource_impl); - if (d3d12_resource_is_texture(resource_impl)) - { - FIXME("Not implemented for textures.\n"); - return; - } if (rect_count) { FIXME("Clear rects not supported.\n"); @@ -3905,14 +3902,34 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID d3d12_command_list_end_current_render_pass(list); cpu_descriptor = d3d12_desc_from_cpu_handle(cpu_handle); - if (!cpu_descriptor->view_size) + + if (d3d12_resource_is_buffer(resource_impl)) { - FIXME("Not supported for UAV descriptor %p.\n", cpu_descriptor); - return; + if (!cpu_descriptor->uav.buffer.size) + { + FIXME("Not supported for UAV descriptor %p.\n", cpu_descriptor); + return; + } + + VK_CALL(vkCmdFillBuffer(list->vk_command_buffer, resource_impl->u.vk_buffer, + cpu_descriptor->uav.buffer.offset, cpu_descriptor->uav.buffer.size, values[0])); } + else + { + color.uint32[0] = values[0]; + color.uint32[1] = values[1]; + color.uint32[2] = values[2]; + color.uint32[3] = values[3]; + + range.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; + range.baseMipLevel = cpu_descriptor->uav.texture.miplevel_idx; + range.levelCount = 1; + range.baseArrayLayer = cpu_descriptor->uav.texture.layer_idx; + range.layerCount = cpu_descriptor->uav.texture.layer_count; - VK_CALL(vkCmdFillBuffer(list->vk_command_buffer, resource_impl->u.vk_buffer, - cpu_descriptor->view_offset, cpu_descriptor->view_size, values[0])); + VK_CALL(vkCmdClearColorImage(list->vk_command_buffer, + resource_impl->u.vk_image, VK_IMAGE_LAYOUT_GENERAL, &color, 1, &range)); + } } static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewFloat(ID3D12GraphicsCommandList *iface, diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 88ab64552bb5..4490ae23dab9 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1635,8 +1635,8 @@ static void vkd3d_create_buffer_uav(struct d3d12_desc *descriptor, struct d3d12_ { const struct vkd3d_format *format = vkd3d_get_format(DXGI_FORMAT_R32_UINT, false); - descriptor->view_offset = desc->u.Buffer.FirstElement * format->byte_count; - descriptor->view_size = desc->u.Buffer.NumElements * format->byte_count; + descriptor->uav.buffer.offset = desc->u.Buffer.FirstElement * format->byte_count; + descriptor->uav.buffer.size = desc->u.Buffer.NumElements * format->byte_count; } } @@ -1691,6 +1691,10 @@ static void vkd3d_create_texture_uav(struct d3d12_desc *descriptor, descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_UAV; descriptor->vk_descriptor_type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE; descriptor->u.view = view; + + descriptor->uav.texture.miplevel_idx = vkd3d_desc.miplevel_idx; + descriptor->uav.texture.layer_idx = vkd3d_desc.layer_idx; + descriptor->uav.texture.layer_count = vkd3d_desc.layer_count; } void d3d12_desc_create_uav(struct d3d12_desc *descriptor, struct d3d12_device *device, diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 5461cc3d36e1..6ba12f9ca1d2 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -272,8 +272,20 @@ struct d3d12_desc struct vkd3d_view *view; } u; - VkDeviceSize view_offset; - VkDeviceSize view_size; + union + { + struct + { + VkDeviceSize offset; + VkDeviceSize size; + } buffer; + struct + { + unsigned int miplevel_idx; + unsigned int layer_idx; + unsigned int layer_count; + } texture; + } uav; }; static inline struct d3d12_desc *d3d12_desc_from_cpu_handle(D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle) -- 2.16.4

2 1

[PATCH vkd3d 5/8] vkd3d: Fix leaks if d3d12_device_init_pipeline_cache() fails.
by Józef Kucia 13 Sep '18

13 Sep '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/device.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index c1db7d30a9e8..b57e3ceb99e5 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1280,6 +1280,14 @@ static HRESULT d3d12_device_init_pipeline_cache(struct d3d12_device *device) VkResult vr; int rc; + if ((rc = pthread_mutex_init(&device->pipeline_cache_mutex, NULL))) + { + ERR("Failed to initialize mutex, error %d.\n", rc); + return E_FAIL; + } + + rb_init(&device->pipeline_cache, compare_pipeline_cache_entry); + cache_info.sType = VK_STRUCTURE_TYPE_PIPELINE_CACHE_CREATE_INFO; cache_info.pNext = NULL; cache_info.flags = 0; @@ -1292,14 +1300,6 @@ static HRESULT d3d12_device_init_pipeline_cache(struct d3d12_device *device) device->vk_pipeline_cache = VK_NULL_HANDLE; } - rb_init(&device->pipeline_cache, compare_pipeline_cache_entry); - - if ((rc = pthread_mutex_init(&device->pipeline_cache_mutex, NULL))) - { - ERR("Failed to initialize mutex, error %d.\n", rc); - return E_FAIL; - } - return S_OK; } -- 2.16.4

2 1

[PATCH vkd3d 4/8] tests: Add test for ld instruction with texel offsets.
by Józef Kucia 13 Sep '18

13 Sep '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 219 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 219 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 221157faa53f..659a5c6a2208 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -9209,6 +9209,224 @@ static void test_texture(void) destroy_test_context(&context); } +static void test_texture_ld(void) +{ + ID3D12GraphicsCommandList *command_list; + D3D12_GPU_DESCRIPTOR_HANDLE gpu_handle; + struct test_context_desc desc; + struct test_context context; + ID3D12DescriptorHeap *heap; + ID3D12CommandQueue *queue; + ID3D12Resource *texture; + unsigned int i; + + static const DWORD ps_ld_code[] = + { +#if 0 + Texture2D t; + + int2 offset; + uint2 location; + + float4 main() : SV_Target + { + switch (offset.x) + { + case -1: + switch (offset.y) + { + case -2: return t.Load(uint3(location, 0), int2(-1, -2)); + case -1: return t.Load(uint3(location, 0), int2(-1, -1)); + case 0: return t.Load(uint3(location, 0), int2(-1, 0)); + case 1: return t.Load(uint3(location, 0), int2(-1, 1)); + case 2: return t.Load(uint3(location, 0), int2(-1, 2)); + } + break; + case 0: + switch (offset.y) + { + case -2: return t.Load(uint3(location, 0), int2(0, -2)); + case -1: return t.Load(uint3(location, 0), int2(0, -1)); + case 0: return t.Load(uint3(location, 0), int2(0, 0)); + case 1: return t.Load(uint3(location, 0), int2(0, 1)); + case 2: return t.Load(uint3(location, 0), int2(0, 2)); + } + break; + case 1: + switch (offset.y) + { + case -2: return t.Load(uint3(location, 0), int2(1, -2)); + case -1: return t.Load(uint3(location, 0), int2(1, -1)); + case 0: return t.Load(uint3(location, 0), int2(1, 0)); + case 1: return t.Load(uint3(location, 0), int2(1, 1)); + case 2: return t.Load(uint3(location, 0), int2(1, 2)); + } + break; + } + + return t.Load(uint3(location, 0)); + } +#endif + 0x43425844, 0xe925cc02, 0x43ea9623, 0xb67c6425, 0xb4503305, 0x00000001, 0x00000844, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x000007cc, 0x00000050, 0x000001f3, + 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x04001858, 0x00107000, 0x00000000, + 0x00005555, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x0400004c, 0x0020800a, + 0x00000000, 0x00000000, 0x03000006, 0x00004001, 0xffffffff, 0x0400004c, 0x0020801a, 0x00000000, + 0x00000000, 0x03000006, 0x00004001, 0xfffffffe, 0x06000036, 0x00100032, 0x00000000, 0x00208ae6, + 0x00000000, 0x00000000, 0x08000036, 0x001000c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x8a00002d, 0x8001de01, 0x800000c2, 0x00155543, 0x001020f2, 0x00000000, + 0x00100e46, 0x00000000, 0x00107e46, 0x00000000, 0x0100003e, 0x03000006, 0x00004001, 0xffffffff, + 0x06000036, 0x00100032, 0x00000000, 0x00208ae6, 0x00000000, 0x00000000, 0x08000036, 0x001000c2, + 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8a00002d, 0x8001fe01, + 0x800000c2, 0x00155543, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x00107e46, 0x00000000, + 0x0100003e, 0x03000006, 0x00004001, 0x00000000, 0x06000036, 0x00100032, 0x00000000, 0x00208ae6, + 0x00000000, 0x00000000, 0x08000036, 0x001000c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x8a00002d, 0x80001e01, 0x800000c2, 0x00155543, 0x001020f2, 0x00000000, + 0x00100e46, 0x00000000, 0x00107e46, 0x00000000, 0x0100003e, 0x03000006, 0x00004001, 0x00000001, + 0x06000036, 0x00100032, 0x00000000, 0x00208ae6, 0x00000000, 0x00000000, 0x08000036, 0x001000c2, + 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8a00002d, 0x80003e01, + 0x800000c2, 0x00155543, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x00107e46, 0x00000000, + 0x0100003e, 0x03000006, 0x00004001, 0x00000002, 0x06000036, 0x00100032, 0x00000000, 0x00208ae6, + 0x00000000, 0x00000000, 0x08000036, 0x001000c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x8a00002d, 0x80005e01, 0x800000c2, 0x00155543, 0x001020f2, 0x00000000, + 0x00100e46, 0x00000000, 0x00107e46, 0x00000000, 0x0100003e, 0x0100000a, 0x01000002, 0x01000017, + 0x01000002, 0x03000006, 0x00004001, 0x00000000, 0x0400004c, 0x0020801a, 0x00000000, 0x00000000, + 0x03000006, 0x00004001, 0xfffffffe, 0x06000036, 0x00100032, 0x00000000, 0x00208ae6, 0x00000000, + 0x00000000, 0x08000036, 0x001000c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x8a00002d, 0x8001c001, 0x800000c2, 0x00155543, 0x001020f2, 0x00000000, 0x00100e46, + 0x00000000, 0x00107e46, 0x00000000, 0x0100003e, 0x03000006, 0x00004001, 0xffffffff, 0x06000036, + 0x00100032, 0x00000000, 0x00208ae6, 0x00000000, 0x00000000, 0x08000036, 0x001000c2, 0x00000000, + 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8a00002d, 0x8001e001, 0x800000c2, + 0x00155543, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x00107e46, 0x00000000, 0x0100003e, + 0x03000006, 0x00004001, 0x00000000, 0x06000036, 0x00100032, 0x00000000, 0x00208ae6, 0x00000000, + 0x00000000, 0x08000036, 0x001000c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x8900002d, 0x800000c2, 0x00155543, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, + 0x00107e46, 0x00000000, 0x0100003e, 0x03000006, 0x00004001, 0x00000001, 0x06000036, 0x00100032, + 0x00000000, 0x00208ae6, 0x00000000, 0x00000000, 0x08000036, 0x001000c2, 0x00000000, 0x00004002, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8a00002d, 0x80002001, 0x800000c2, 0x00155543, + 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x00107e46, 0x00000000, 0x0100003e, 0x03000006, + 0x00004001, 0x00000002, 0x06000036, 0x00100032, 0x00000000, 0x00208ae6, 0x00000000, 0x00000000, + 0x08000036, 0x001000c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x8a00002d, 0x80004001, 0x800000c2, 0x00155543, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, + 0x00107e46, 0x00000000, 0x0100003e, 0x0100000a, 0x01000002, 0x01000017, 0x01000002, 0x03000006, + 0x00004001, 0x00000001, 0x0400004c, 0x0020801a, 0x00000000, 0x00000000, 0x03000006, 0x00004001, + 0xfffffffe, 0x06000036, 0x00100032, 0x00000000, 0x00208ae6, 0x00000000, 0x00000000, 0x08000036, + 0x001000c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8a00002d, + 0x8001c201, 0x800000c2, 0x00155543, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x00107e46, + 0x00000000, 0x0100003e, 0x03000006, 0x00004001, 0xffffffff, 0x06000036, 0x00100032, 0x00000000, + 0x00208ae6, 0x00000000, 0x00000000, 0x08000036, 0x001000c2, 0x00000000, 0x00004002, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x8a00002d, 0x8001e201, 0x800000c2, 0x00155543, 0x001020f2, + 0x00000000, 0x00100e46, 0x00000000, 0x00107e46, 0x00000000, 0x0100003e, 0x03000006, 0x00004001, + 0x00000000, 0x06000036, 0x00100032, 0x00000000, 0x00208ae6, 0x00000000, 0x00000000, 0x08000036, + 0x001000c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8a00002d, + 0x80000201, 0x800000c2, 0x00155543, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x00107e46, + 0x00000000, 0x0100003e, 0x03000006, 0x00004001, 0x00000001, 0x06000036, 0x00100032, 0x00000000, + 0x00208ae6, 0x00000000, 0x00000000, 0x08000036, 0x001000c2, 0x00000000, 0x00004002, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x8a00002d, 0x80002201, 0x800000c2, 0x00155543, 0x001020f2, + 0x00000000, 0x00100e46, 0x00000000, 0x00107e46, 0x00000000, 0x0100003e, 0x03000006, 0x00004001, + 0x00000002, 0x06000036, 0x00100032, 0x00000000, 0x00208ae6, 0x00000000, 0x00000000, 0x08000036, + 0x001000c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8a00002d, + 0x80004201, 0x800000c2, 0x00155543, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x00107e46, + 0x00000000, 0x0100003e, 0x0100000a, 0x01000002, 0x01000017, 0x01000002, 0x0100000a, 0x01000002, + 0x01000017, 0x06000036, 0x00100032, 0x00000000, 0x00208ae6, 0x00000000, 0x00000000, 0x08000036, + 0x001000c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8900002d, + 0x800000c2, 0x00155543, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x00107e46, 0x00000000, + 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps_ld = {ps_ld_code, sizeof(ps_ld_code)}; + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + static const unsigned int texture_data[] = + { + 0xff0008ff, 0xff00ffff, 0xff00ff05, 0xffffff01, + 0xffff0007, 0xffff00ff, 0x11111101, 0xff7f7f7f, + 0x44444f44, 0x88888888, 0x22222222, 0xff000002, + 0x66f66666, 0xff000000, 0xff000003, 0x55555555, + }; + static const D3D12_SUBRESOURCE_DATA resource_data = {&texture_data, sizeof(texture_data) / 4}; + static const struct + { + int32_t constants[4]; + unsigned int expected_color; + } + tests[] = + { + {{ 0, 0, 0, 0}, 0xff0008ff}, + {{ 1, 0, 0, 0}, 0xff00ffff}, + {{ 0, 1, 0, 0}, 0xffff0007}, + {{ 1, 1, 0, 0}, 0xffff00ff}, + {{ 3, 3, 0, 0}, 0xff0008ff}, + {{ 3, 3, 1, 1}, 0xffff00ff}, + {{ 0, 0, 3, 3}, 0x55555555}, + {{-1, -1, 3, 3}, 0x22222222}, + {{-1, -2, 3, 3}, 0x11111101}, + {{ 0, -1, 3, 3}, 0xff000002}, + {{ 0, -2, 3, 3}, 0xff7f7f7f}, + {{ 3, 3, 3, 3}, 0x55555555}, + }; + + if (use_warp_device) + { + skip("WARP device is removed when ps_ld is used.\n"); + return; + } + + memset(&desc, 0, sizeof(desc)); + desc.rt_width = desc.rt_height = 32; + desc.no_root_signature = true; + if (!init_test_context(&context, &desc)) + return; + command_list = context.list; + queue = context.queue; + + context.root_signature = create_texture_root_signature(context.device, + D3D12_SHADER_VISIBILITY_PIXEL, 4, 0); + context.pipeline_state = create_pipeline_state(context.device, + context.root_signature, context.render_target_desc.Format, NULL, &ps_ld, NULL); + + heap = create_gpu_descriptor_heap(context.device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1); + gpu_handle = ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(heap); + + texture = create_default_texture(context.device, + 4, 4, DXGI_FORMAT_R8G8B8A8_UNORM, 0, D3D12_RESOURCE_STATE_COPY_DEST); + upload_texture_data(texture, &resource_data, 1, queue, command_list); + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, texture, + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE); + ID3D12Device_CreateShaderResourceView(context.device, texture, NULL, + ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(heap)); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &heap); + ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0, gpu_handle); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 1, + ARRAY_SIZE(tests[i].constants), &tests[i].constants, 0); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(context.render_target, 0, queue, command_list, tests[i].expected_color, 0); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + } + + ID3D12Resource_Release(texture); + ID3D12DescriptorHeap_Release(heap); + destroy_test_context(&context); +} + static void test_gather(void) { struct @@ -19285,6 +19503,7 @@ START_TEST(d3d12) run_test(test_immediate_constant_buffer); run_test(test_root_constants); run_test(test_texture); + run_test(test_texture_ld); run_test(test_gather); run_test(test_cube_maps); run_test(test_descriptor_tables); -- 2.16.4

2 1

[PATCH vkd3d 3/8] vkd3d-shader: Implement texel offset for sample instructions.
by Józef Kucia 13 Sep '18

13 Sep '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index f0e2491a68bd..964bc49b3179 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5322,7 +5322,7 @@ static void vkd3d_dxbc_compiler_emit_sample(struct vkd3d_dxbc_compiler *compiler SpvImageOperandsMask operands_mask = 0; unsigned int image_operand_count = 0; struct vkd3d_shader_image image; - uint32_t image_operands[1]; + uint32_t image_operands[2]; SpvOp op; switch (instruction->handler_idx) @@ -5341,11 +5341,16 @@ static void vkd3d_dxbc_compiler_emit_sample(struct vkd3d_dxbc_compiler *compiler return; } - if (vkd3d_shader_instruction_has_texel_offset(instruction)) - FIXME("Texel offset not supported.\n"); - vkd3d_dxbc_compiler_prepare_sampled_image(compiler, &image, &src[1].reg, &src[2].reg, VKD3D_IMAGE_FLAG_NONE); + + if (vkd3d_shader_instruction_has_texel_offset(instruction)) + { + operands_mask |= SpvImageOperandsConstOffsetMask; + image_operands[image_operand_count++] = vkd3d_dxbc_compiler_emit_texel_offset(compiler, + instruction, image.resource_type_info); + } + sampled_type_id = vkd3d_spirv_get_type_id(builder, image.sampled_type, VKD3D_VEC4_SIZE); coordinate_id = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[0], VKD3DSP_WRITEMASK_ALL); val_id = vkd3d_spirv_build_op_image_sample(builder, op, sampled_type_id, -- 2.16.4

2 1