January 2017 - Wine-commits

Austin English : rstrtmgr: Add RmShutdown stub.
by Alexandre Julliard 26 Jan '17

26 Jan '17

Module: wine Branch: master Commit: f0555c5ebc277d43089769e3568b1315d2fce852 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0555c5ebc277d43089769e35… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Dec 28 02:18:13 2016 -0600 rstrtmgr: Add RmShutdown stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rstrtmgr/main.c | 9 +++++++++ dlls/rstrtmgr/rstrtmgr.spec | 2 +- include/restartmanager.h | 2 ++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/rstrtmgr/main.c b/dlls/rstrtmgr/main.c index 2d45639..5c9a8dc 100644 --- a/dlls/rstrtmgr/main.c +++ b/dlls/rstrtmgr/main.c @@ -100,3 +100,12 @@ DWORD WINAPI RmEndSession(DWORD handle) FIXME("%u stub!\n", handle); return ERROR_CALL_NOT_IMPLEMENTED; } + +/*********************************************************************** + * RmShutdown (rstrtmgr.@) + */ +DWORD WINAPI RmShutdown(DWORD handle, ULONG flags, RM_WRITE_STATUS_CALLBACK status) +{ + FIXME("%u, 0x%08x, %p stub!\n", handle, flags, status); + return ERROR_CALL_NOT_IMPLEMENTED; +} diff --git a/dlls/rstrtmgr/rstrtmgr.spec b/dlls/rstrtmgr/rstrtmgr.spec index 0e1ba79..6c6a9c9 100644 --- a/dlls/rstrtmgr/rstrtmgr.spec +++ b/dlls/rstrtmgr/rstrtmgr.spec @@ -8,5 +8,5 @@ @ stub RmRemoveFilter @ stub RmReserveHeap @ stdcall RmRestart(long long ptr) -@ stub RmShutdown +@ stdcall RmShutdown(long long ptr) @ stdcall RmStartSession(ptr long ptr) diff --git a/include/restartmanager.h b/include/restartmanager.h index 27c1a92..9ee066d 100644 --- a/include/restartmanager.h +++ b/include/restartmanager.h @@ -64,6 +64,8 @@ typedef struct { BOOL bRestartable; } RM_PROCESS_INFO, *PRM_PROCESS_INFO; +typedef void (CDECL *RM_WRITE_STATUS_CALLBACK)(UINT); + #ifdef __cplusplus } #endif

1 0

Sebastian Lackner : rstrtmgr: Use correct type for status parameter in RmRestart.
by Alexandre Julliard 26 Jan '17

26 Jan '17

Module: wine Branch: master Commit: d9c907b691d8184a181970376bdd2b020105b52e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9c907b691d8184a181970376… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Jan 26 16:48:28 2017 +0100 rstrtmgr: Use correct type for status parameter in RmRestart. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rstrtmgr/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/rstrtmgr/main.c b/dlls/rstrtmgr/main.c index 5c9a8dc..433bd17 100644 --- a/dlls/rstrtmgr/main.c +++ b/dlls/rstrtmgr/main.c @@ -86,9 +86,9 @@ DWORD WINAPI RmStartSession(DWORD *sessionhandle, DWORD flags, WCHAR sessionkey[ /*********************************************************************** * RmRestart (rstrtmgr.@) */ -DWORD WINAPI RmRestart(DWORD handle, DWORD flags, void *fnstatus) +DWORD WINAPI RmRestart(DWORD handle, DWORD flags, RM_WRITE_STATUS_CALLBACK status) { - FIXME("%u, 0x%08x, %p stub!\n", handle, flags, fnstatus); + FIXME("%u, 0x%08x, %p stub!\n", handle, flags, status); return ERROR_CALL_NOT_IMPLEMENTED; }

1 0

Huw Davies : usp10/tests: Reorder the todo and broken arrays to match the order of the expected values.
by Alexandre Julliard 26 Jan '17

26 Jan '17

Module: wine Branch: master Commit: 427caff915cc6ade6e240601da6156fac298c13d URL: http://source.winehq.org/git/wine.git/?a=commit;h=427caff915cc6ade6e240601d… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jan 26 09:23:03 2017 +0000 usp10/tests: Reorder the todo and broken arrays to match the order of the expected values. Also ensure that all elements of the broken arrays are explicitly initialized. This allows many tests to run that were previously incorrectly skipped. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 86 +++++++++++++++++++++++++----------------------- 1 file changed, 44 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=427caff915cc6ade6e240…

1 0

Huw Davies : urlmon/tests: Allow QueryInterface to accept IUnknown and IInternetProtocolSink.
by Alexandre Julliard 26 Jan '17

26 Jan '17

Module: wine Branch: master Commit: 7453c835e996e349a5db50533a587c86e911159e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7453c835e996e349a5db50533… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jan 26 11:07:59 2017 +0000 urlmon/tests: Allow QueryInterface to accept IUnknown and IInternetProtocolSink. Fixes a crash on modern versions of Windows 10. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/protocol.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index dad87ed..5981c25 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -1110,6 +1110,12 @@ static IInternetProtocolSink protocol_sink = { &protocol_sink_vtbl }; static HRESULT WINAPI MimeProtocolSink_QueryInterface(IInternetProtocolSink *iface, REFIID riid, void **ppv) { + if(IsEqualGUID(&IID_IUnknown, riid) + || IsEqualGUID(&IID_IInternetProtocolSink, riid)) { + *ppv = iface; + return S_OK; + } + ok(0, "unexpected call\n"); return E_NOTIMPL; }

1 0

Józef Kucia : include/d3d11: Add D3D11_BUFFEREX_SRV_FLAG_RAW.
by Alexandre Julliard 26 Jan '17

26 Jan '17

Module: wine Branch: master Commit: eb18e57915029fc43805d8c407dde69f7e3fbbd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb18e57915029fc43805d8c40… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 26 13:13:46 2017 +0100 include/d3d11: Add D3D11_BUFFEREX_SRV_FLAG_RAW. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d11.idl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/d3d11.idl b/include/d3d11.idl index d2b3836..ad676c7 100644 --- a/include/d3d11.idl +++ b/include/d3d11.idl @@ -595,6 +595,11 @@ typedef enum D3D11_DSV_FLAG D3D11_DSV_READ_ONLY_STENCIL = 0x2, } D3D11_DSV_FLAG; +typedef enum D3D11_BUFFEREX_SRV_FLAG +{ + D3D11_BUFFEREX_SRV_FLAG_RAW = 0x1, +} D3D11_BUFFEREX_SRV_FLAG; + typedef enum D3D11_UAV_FLAG { D3D11_BUFFER_UAV_FLAG_RAW = 0x1,

1 0

Józef Kucia : d3d11/tests: Use correct raw buffer flag for SRVs.
by Alexandre Julliard 26 Jan '17

26 Jan '17

Module: wine Branch: master Commit: 24c45805c08d4bc0764829d615875fb95290d85d URL: http://source.winehq.org/git/wine.git/?a=commit;h=24c45805c08d4bc0764829d61… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 26 13:07:28 2017 +0100 d3d11/tests: Use correct raw buffer flag for SRVs. Signed-off-by: Józef Kucia <jkucia(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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 6911a77..ed1401a 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -12956,7 +12956,7 @@ static void test_sm5_bufinfo_instruction(void) U(srv_desc).BufferEx.NumElements = test->view_element_count; U(srv_desc).BufferEx.Flags = 0; if (buffer_desc.MiscFlags & D3D11_RESOURCE_MISC_BUFFER_ALLOW_RAW_VIEWS) - U(srv_desc).BufferEx.Flags |= D3D11_BUFFER_UAV_FLAG_RAW; + U(srv_desc).BufferEx.Flags |= D3D11_BUFFEREX_SRV_FLAG_RAW; hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)buffer, &srv_desc, &srv); ok(SUCCEEDED(hr), "Test %u: Failed to create shader resource view, hr %#x.\n", i, hr); uav = NULL;

1 0

Józef Kucia : wined3d: Add ARB_texture_buffer_object extension.
by Alexandre Julliard 26 Jan '17

26 Jan '17

Module: wine Branch: master Commit: 83057194569d014f01f79a6f7f93604c1ab52f76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83057194569d014f01f79a6f7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 26 13:07:29 2017 +0100 wined3d: Add ARB_texture_buffer_object extension. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 6 ++++++ dlls/wined3d/wined3d_gl.h | 1 + 2 files changed, 7 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c8b4756..944a4a3 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -154,6 +154,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_stencil_texturing", ARB_STENCIL_TEXTURING }, {"GL_ARB_sync", ARB_SYNC }, {"GL_ARB_texture_border_clamp", ARB_TEXTURE_BORDER_CLAMP }, + {"GL_ARB_texture_buffer_object", ARB_TEXTURE_BUFFER_OBJECT }, {"GL_ARB_texture_compression", ARB_TEXTURE_COMPRESSION }, {"GL_ARB_texture_compression_bptc", ARB_TEXTURE_COMPRESSION_BPTC }, {"GL_ARB_texture_compression_rgtc", ARB_TEXTURE_COMPRESSION_RGTC }, @@ -2784,6 +2785,8 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glGetSynciv) USE_GL_FUNC(glIsSync) USE_GL_FUNC(glWaitSync) + /* GL_ARB_texture_buffer_object */ + USE_GL_FUNC(glTexBufferARB) /* GL_ARB_texture_compression */ USE_GL_FUNC(glCompressedTexImage2DARB) USE_GL_FUNC(glCompressedTexImage3DARB) @@ -3156,6 +3159,7 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glShaderSource) /* OpenGL 2.0 */ USE_GL_FUNC(glStencilFuncSeparate) /* OpenGL 2.0 */ USE_GL_FUNC(glStencilOpSeparate) /* OpenGL 2.0 */ + USE_GL_FUNC(glTexBuffer) /* OpenGL 3.1 */ USE_GL_FUNC(glTexImage3D) /* OpenGL 1.2 */ USE_GL_FUNC(glTexSubImage3D) /* OpenGL 1.2 */ USE_GL_FUNC(glUniform1f) /* OpenGL 2.0 */ @@ -3277,6 +3281,7 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) MAP_GL_FUNCTION(glLinkProgram, glLinkProgramARB); MAP_GL_FUNCTION(glMapBuffer, glMapBufferARB); MAP_GL_FUNCTION_CAST(glShaderSource, glShaderSourceARB); + MAP_GL_FUNCTION(glTexBuffer, glTexBufferARB); MAP_GL_FUNCTION_CAST(glTexImage3D, glTexImage3DEXT); MAP_GL_FUNCTION(glTexSubImage3D, glTexSubImage3DEXT); MAP_GL_FUNCTION(glUniform1f, glUniform1fARB); @@ -3621,6 +3626,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD {ARB_COPY_BUFFER, MAKEDWORD_VERSION(3, 1)}, {ARB_DRAW_INSTANCED, MAKEDWORD_VERSION(3, 1)}, + {ARB_TEXTURE_BUFFER_OBJECT, MAKEDWORD_VERSION(3, 1)}, {ARB_UNIFORM_BUFFER_OBJECT, MAKEDWORD_VERSION(3, 1)}, {EXT_TEXTURE_SNORM, MAKEDWORD_VERSION(3, 1)}, /* We don't need or want GL_ARB_texture_rectangle (core in 3.1). */ diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index cb1647c..84c49c3 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -87,6 +87,7 @@ enum wined3d_gl_extension ARB_STENCIL_TEXTURING, ARB_SYNC, ARB_TEXTURE_BORDER_CLAMP, + ARB_TEXTURE_BUFFER_OBJECT, ARB_TEXTURE_COMPRESSION, ARB_TEXTURE_COMPRESSION_BPTC, ARB_TEXTURE_COMPRESSION_RGTC,

1 0

Józef Kucia : wined3d: Create dummy buffer textures.
by Alexandre Julliard 26 Jan '17

26 Jan '17

Module: wine Branch: master Commit: e800093706e7b56ae1df73182ec52f906295a975 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e800093706e7b56ae1df73182… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 26 13:07:30 2017 +0100 wined3d: Create dummy buffer textures. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 7 +++++++ dlls/wined3d/device.c | 26 ++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 34 insertions(+) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index b4e40fd..cd0057e 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1545,6 +1545,9 @@ void context_bind_dummy_textures(const struct wined3d_device *device, const stru if (gl_info->supported[EXT_TEXTURE_ARRAY]) gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_2D_ARRAY, device->dummy_textures.tex_2d_array); + if (gl_info->supported[ARB_TEXTURE_BUFFER_OBJECT]) + gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_BUFFER, device->dummy_textures.tex_buffer); + checkGLcall("Bind dummy textures"); } } @@ -2443,6 +2446,10 @@ void context_bind_texture(struct wined3d_context *context, GLenum target, GLuint gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_3D, device->dummy_textures.tex_3d); checkGLcall("glBindTexture"); break; + case GL_TEXTURE_BUFFER: + gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_BUFFER, device->dummy_textures.tex_buffer); + checkGLcall("glBindTexture"); + break; default: ERR("Unexpected texture target %#x.\n", old_texture_type); } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 75a939e..7898527 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -694,6 +694,29 @@ static void create_dummy_textures(struct wined3d_device *device, struct wined3d_ checkGLcall("glTexImage3D"); } + if (gl_info->supported[ARB_TEXTURE_BUFFER_OBJECT]) + { + GLuint buffer; + + GL_EXTCALL(glGenBuffers(1, &buffer)); + GL_EXTCALL(glBindBuffer(GL_TEXTURE_BUFFER, buffer)); + GL_EXTCALL(glBufferData(GL_TEXTURE_BUFFER, sizeof(color), &color, GL_STATIC_DRAW)); + GL_EXTCALL(glBindBuffer(GL_TEXTURE_BUFFER, 0)); + checkGLcall("Create buffer object"); + + gl_info->gl_ops.gl.p_glGenTextures(1, &device->dummy_textures.tex_buffer); + checkGLcall("glGenTextures"); + TRACE("Dummy buffer texture given name %u.\n", device->dummy_textures.tex_buffer); + + gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_BUFFER, device->dummy_textures.tex_buffer); + checkGLcall("glBindTexture"); + GL_EXTCALL(glTexBuffer(GL_TEXTURE_BUFFER, GL_RGBA8, buffer)); + checkGLcall("glTexBuffer"); + + GL_EXTCALL(glDeleteBuffers(1, &buffer)); + checkGLcall("glDeleteBuffers"); + } + context_bind_dummy_textures(device, context); } @@ -702,6 +725,9 @@ static void destroy_dummy_textures(struct wined3d_device *device, struct wined3d { const struct wined3d_gl_info *gl_info = context->gl_info; + if (gl_info->supported[ARB_TEXTURE_BUFFER_OBJECT]) + gl_info->gl_ops.gl.p_glDeleteTextures(1, &device->dummy_textures.tex_buffer); + if (gl_info->supported[EXT_TEXTURE_ARRAY]) gl_info->gl_ops.gl.p_glDeleteTextures(1, &device->dummy_textures.tex_2d_array); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4ee9d5c..5c94803 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2587,6 +2587,7 @@ struct wined3d_device GLuint tex_3d; GLuint tex_cube; GLuint tex_2d_array; + GLuint tex_buffer; } dummy_textures; /* Default sampler used to emulate the direct resource access without using wined3d_sampler */

1 0

Józef Kucia : wined3d: Add initial support for shader buffer views.
by Alexandre Julliard 26 Jan '17

26 Jan '17

Module: wine Branch: master Commit: 81878178303ed52a18330fdb668c7d1dc1c02ade URL: http://source.winehq.org/git/wine.git/?a=commit;h=81878178303ed52a18330fdb6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 26 13:07:31 2017 +0100 wined3d: Add initial support for shader buffer views. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 2 +- dlls/wined3d/view.c | 51 +++++++++++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 53 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 6883b40..7d0552b 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -567,7 +567,7 @@ static BOOL wined3d_buffer_prepare_location(struct wined3d_buffer *buffer, } } -static BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, +BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, struct wined3d_context *context, DWORD location) { const struct wined3d_gl_info *gl_info = context->gl_info; diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 18b7180..c63d913 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -121,6 +121,35 @@ static void create_texture_view(struct wined3d_gl_view *view, GLenum view_target context_release(context); } +static void create_buffer_texture(struct wined3d_gl_view *view, + struct wined3d_buffer *buffer, const struct wined3d_format *view_format) +{ + const struct wined3d_gl_info *gl_info; + struct wined3d_context *context; + + context = context_acquire(buffer->resource.device, NULL); + gl_info = context->gl_info; + if (!gl_info->supported[ARB_TEXTURE_BUFFER_OBJECT]) + { + FIXME("OpenGL implementation does not support buffer textures.\n"); + context_release(context); + return; + } + + wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_BUFFER); + + view->target = GL_TEXTURE_BUFFER; + gl_info->gl_ops.gl.p_glGenTextures(1, &view->name); + + context_bind_texture(context, GL_TEXTURE_BUFFER, view->name); + GL_EXTCALL(glTexBuffer(GL_TEXTURE_BUFFER, view_format->glInternal, buffer->buffer_object)); + checkGLcall("Create buffer texture"); + + context_invalidate_state(context, STATE_SHADER_RESOURCE_BINDING); + + context_release(context); +} + ULONG CDECL wined3d_rendertarget_view_incref(struct wined3d_rendertarget_view *view) { ULONG refcount = InterlockedIncrement(&view->refcount); @@ -415,7 +444,27 @@ static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_ if (resource->type == WINED3D_RTYPE_BUFFER) { - FIXME("Buffer shader resource views not supported.\n"); + struct wined3d_buffer *buffer = buffer_from_resource(resource); + + if (desc->format_id == WINED3DFMT_UNKNOWN) + { + FIXME("Structured buffer views not supported.\n"); + } + else if (desc->flags & WINED3D_VIEW_BUFFER_RAW) + { + FIXME("Raw buffer views not supported.\n"); + } + else + { + /* FIXME: Support for buffer offsets can be implemented using ARB_texture_buffer_range. */ + if (desc->u.buffer.start_idx + || desc->u.buffer.count * view_format->byte_count != buffer->resource.size) + { + FIXME("Ignoring buffer range %u-%u.\n", desc->u.buffer.start_idx, desc->u.buffer.count); + } + + create_buffer_texture(&view->gl_view, buffer, view_format); + } } else { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5c94803..051836c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3256,6 +3256,8 @@ DWORD wined3d_buffer_get_memory(struct wined3d_buffer *buffer, void wined3d_buffer_invalidate_location(struct wined3d_buffer *buffer, DWORD location) DECLSPEC_HIDDEN; void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context *context, const struct wined3d_state *state) DECLSPEC_HIDDEN; +BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, + struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; BYTE *wined3d_buffer_load_sysmem(struct wined3d_buffer *buffer, struct wined3d_context *context) DECLSPEC_HIDDEN; HRESULT wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_offset, struct wined3d_buffer *src_buffer, unsigned int src_offset, unsigned int size) DECLSPEC_HIDDEN;

1 0

Józef Kucia : wined3d: Do not pass LOD to texelFetch( ) for buffer resources.
by Alexandre Julliard 26 Jan '17

26 Jan '17

Module: wine Branch: master Commit: 65089c395dbb44eb4f2bf8a7722092254d277549 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65089c395dbb44eb4f2bf8a77… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 26 13:07:32 2017 +0100 wined3d: Do not pass LOD to texelFetch() for buffer resources. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 3cdc957..c6a51c5 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4956,10 +4956,12 @@ static void shader_glsl_resinfo(const struct wined3d_shader_instruction *ins) /* FIXME: The current implementation does not handle multisample textures correctly. */ static void shader_glsl_ld(const struct wined3d_shader_instruction *ins) { + const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; unsigned int resource_idx, sampler_idx, sampler_bind_idx; struct glsl_src_param coord_param, lod_param; struct glsl_sample_function sample_function; DWORD flags = WINED3D_GLSL_SAMPLE_LOAD; + BOOL has_lod_param; if (wined3d_shader_instruction_has_texel_offset(ins)) flags |= WINED3D_GLSL_SAMPLE_OFFSET; @@ -4967,12 +4969,20 @@ static void shader_glsl_ld(const struct wined3d_shader_instruction *ins) resource_idx = ins->src[1].reg.idx[0].offset; sampler_idx = WINED3D_SAMPLER_DEFAULT; + if (resource_idx >= ARRAY_SIZE(reg_maps->resource_info)) + { + ERR("Invalid resource index %u.\n", resource_idx); + return; + } + has_lod_param = reg_maps->resource_info[resource_idx].type != WINED3D_SHADER_RESOURCE_BUFFER; + shader_glsl_get_sample_function(ins->ctx, resource_idx, sampler_idx, flags, &sample_function); shader_glsl_add_src_param(ins, &ins->src[0], sample_function.coord_mask, &coord_param); shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_3, &lod_param); - sampler_bind_idx = shader_glsl_find_sampler(&ins->ctx->reg_maps->sampler_map, resource_idx, sampler_idx); + sampler_bind_idx = shader_glsl_find_sampler(&reg_maps->sampler_map, resource_idx, sampler_idx); shader_glsl_gen_sample_code(ins, sampler_bind_idx, &sample_function, ins->src[1].swizzle, - NULL, NULL, lod_param.param_str, &ins->texel_offset, "%s", coord_param.param_str); + NULL, NULL, has_lod_param ? lod_param.param_str : NULL, &ins->texel_offset, + "%s", coord_param.param_str); shader_glsl_release_sample_function(ins->ctx, &sample_function); }

1 0