April 2017 - Wine-Commits - list.winehq.org

Alistair Leslie-Hughes : odbccp32: Implement SQLConfigDriver/W.
by Alexandre Julliard April 7, 2017

April 7, 2017

Module: wine Branch: master Commit: 764ee72641fc1b1f22b9c330a669a5b661a64bd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=764ee72641fc1b1f22b9c330a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Apr 7 10:52:19 2017 +0000 odbccp32: Implement SQLConfigDriver/W. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/odbccp32/odbccp32.c | 114 ++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 104 insertions(+), 10 deletions(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index 773c5d2..666d8c0 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -62,6 +62,9 @@ static const WCHAR odbc_error_component_not_found[] = {'C','o','m','p','o','n',' static const WCHAR odbc_error_out_of_mem[] = {'O','u','t',' ','o','f',' ','m','e','m','o','r','y',0}; static const WCHAR odbc_error_invalid_param_sequence[] = {'I','n','v','a','l','i','d',' ','p','a','r','a','m','e','t','e','r',' ','s','e','q','u','e','n','c','e',0}; static const WCHAR odbc_error_invalid_param_string[] = {'I','n','v','a','l','i','d',' ','p','a','r','a','m','e','t','e','r',' ','s','t','r','i','n','g',0}; +static const WCHAR odbc_error_invalid_dsn[] = {'I','n','v','a','l','i','d',' ','D','S','N',0}; +static const WCHAR odbc_error_load_lib_failed[] = {'L','o','a','d',' ','L','i','b','r','a','r','y',' ','F','a','i','l','e','d',0}; +static const WCHAR odbc_error_request_failed[] = {'R','e','q','u','e','s','t',' ','F','a','i','l','e','d',0}; /* Push an error onto the error stack, taking care of ranges etc. */ static void push_error(int code, LPCWSTR msg) @@ -248,22 +251,113 @@ BOOL WINAPI SQLConfigDataSource(HWND hwndParent, WORD fRequest, return TRUE; } -BOOL WINAPI SQLConfigDriverW(HWND hwndParent, WORD fRequest, LPCWSTR lpszDriver, - LPCWSTR lpszArgs, LPWSTR lpszMsg, WORD cbMsgMax, WORD *pcbMsgOut) +static HMODULE load_config_driver(const WCHAR *driver) { + static WCHAR reg_driver[] = {'d','r','i','v','e','r',0}; + long ret; + HMODULE hmod; + WCHAR *filename = NULL; + DWORD size = 0, type; + HKEY hkey; + + if ((ret = RegOpenKeyW(HKEY_CURRENT_USER, odbcini, &hkey)) == ERROR_SUCCESS) + { + HKEY hkeydriver; + + if ((ret = RegOpenKeyW(hkey, driver, &hkeydriver)) == ERROR_SUCCESS) + { + ret = RegGetValueW(hkeydriver, NULL, reg_driver, RRF_RT_REG_SZ, &type, NULL, &size); + if(ret == ERROR_MORE_DATA) + { + filename = HeapAlloc(GetProcessHeap(), 0, size); + if(!filename) + { + RegCloseKey(hkeydriver); + RegCloseKey(hkey); + push_error(ODBC_ERROR_OUT_OF_MEM, odbc_error_out_of_mem); + + return NULL; + } + ret = RegGetValueW(hkeydriver, NULL, driver, RRF_RT_REG_SZ, &type, filename, &size); + } + + RegCloseKey(hkeydriver); + } + + RegCloseKey(hkey); + } + + if(ret != ERROR_SUCCESS) + { + HeapFree(GetProcessHeap(), 0, filename); + push_error(ODBC_ERROR_INVALID_DSN, odbc_error_invalid_dsn); + return NULL; + } + + hmod = LoadLibraryW(filename); + HeapFree(GetProcessHeap(), 0, filename); + + if(!hmod) + push_error(ODBC_ERROR_LOAD_LIB_FAILED, odbc_error_load_lib_failed); + + return hmod; +} + +BOOL WINAPI SQLConfigDriverW(HWND hwnd, WORD request, LPCWSTR driver, + LPCWSTR args, LPWSTR msg, WORD msgmax, WORD *msgout) +{ + BOOL (WINAPI *pConfigDriverW)(HWND hwnd, WORD request, const WCHAR *driver, const WCHAR *args, const WCHAR *msg, WORD msgmax, WORD *msgout); + HMODULE hmod; + BOOL funcret = FALSE; + clear_errors(); - FIXME("(%p %d %s %s %p %d %p)\n", hwndParent, fRequest, debugstr_w(lpszDriver), - debugstr_w(lpszArgs), lpszMsg, cbMsgMax, pcbMsgOut); - return TRUE; + TRACE("(%p %d %s %s %p %d %p)\n", hwnd, request, debugstr_w(driver), + debugstr_w(args), msg, msgmax, msgout); + + hmod = load_config_driver(driver); + if(!hmod) + return FALSE; + + pConfigDriverW = (void*)GetProcAddress(hmod, "ConfigDriverW"); + if(pConfigDriverW) + funcret = pConfigDriverW(hwnd, request, driver, args, msg, msgmax, msgout); + + if(!funcret) + push_error(ODBC_ERROR_REQUEST_FAILED, odbc_error_request_failed); + + FreeLibrary(hmod); + + return funcret; } -BOOL WINAPI SQLConfigDriver(HWND hwndParent, WORD fRequest, LPCSTR lpszDriver, - LPCSTR lpszArgs, LPSTR lpszMsg, WORD cbMsgMax, WORD *pcbMsgOut) +BOOL WINAPI SQLConfigDriver(HWND hwnd, WORD request, LPCSTR driver, + LPCSTR args, LPSTR msg, WORD msgmax, WORD *msgout) { + BOOL (WINAPI *pConfigDriverA)(HWND hwnd, WORD request, const char *driver, const char *args, const char *msg, WORD msgmax, WORD *msgout); + HMODULE hmod; + WCHAR *driverW; + BOOL funcret = FALSE; + clear_errors(); - FIXME("(%p %d %s %s %p %d %p)\n", hwndParent, fRequest, debugstr_a(lpszDriver), - debugstr_a(lpszArgs), lpszMsg, cbMsgMax, pcbMsgOut); - return TRUE; + TRACE("(%p %d %s %s %p %d %p)\n", hwnd, request, debugstr_a(driver), + debugstr_a(args), msg, msgmax, msgout); + + driverW = heap_strdupAtoW(driver); + hmod = load_config_driver(driverW); + HeapFree(GetProcessHeap(), 0, driverW); + if(!hmod) + return FALSE; + + pConfigDriverA = (void*)GetProcAddress(hmod, "ConfigDriver"); + if(pConfigDriverA) + funcret = pConfigDriverA(hwnd, request, driver, args, msg, msgmax, msgout); + + if(!funcret) + push_error(ODBC_ERROR_REQUEST_FAILED, odbc_error_request_failed); + + FreeLibrary(hmod); + + return funcret; } BOOL WINAPI SQLCreateDataSourceW(HWND hwnd, LPCWSTR lpszDS)

1 0

Henri Verbeet : wined3d: Assume identical source and destination formats in surface_upload_from_surface ().
by Alexandre Julliard April 7, 2017

April 7, 2017

Module: wine Branch: master Commit: 26d7f991258bc5c612a7ea5d5d1ef2064442c3f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26d7f991258bc5c612a7ea5d5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 6 23:44:32 2017 +0200 wined3d: Assume identical source and destination formats in surface_upload_from_surface(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 12 ++++++------ dlls/wined3d/surface.c | 13 +------------ 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 362276d..bd07053 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3551,12 +3551,6 @@ static HRESULT wined3d_device_update_texture_3d(struct wined3d_device *device, TRACE("device %p, src_texture %p, src_level %u, dst_texture %p, level_count %u.\n", device, src_texture, src_level, dst_texture, level_count); - if (src_texture->resource.format != dst_texture->resource.format) - { - WARN("Source and destination formats do not match.\n"); - return WINED3DERR_INVALIDCALL; - } - if (wined3d_texture_get_level_width(src_texture, src_level) != dst_texture->resource.width || wined3d_texture_get_level_height(src_texture, src_level) != dst_texture->resource.height || wined3d_texture_get_level_depth(src_texture, src_level) != dst_texture->resource.depth) @@ -3636,6 +3630,12 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, return WINED3DERR_INVALIDCALL; } + if (src_texture->resource.format != dst_texture->resource.format) + { + WARN("Source and destination formats do not match.\n"); + return WINED3DERR_INVALIDCALL; + } + level_count = min(wined3d_texture_get_level_count(src_texture), wined3d_texture_get_level_count(dst_texture)); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 56fbaf2..c9d9c10 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -874,8 +874,6 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P struct wined3d_texture *src_texture = src_surface->container; struct wined3d_texture *dst_texture = dst_surface->container; unsigned int src_row_pitch, src_slice_pitch; - const struct wined3d_format *src_format; - const struct wined3d_format *dst_format; const struct wined3d_gl_info *gl_info; struct wined3d_context *context; struct wined3d_bo_address data; @@ -887,15 +885,6 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P dst_surface, wine_dbgstr_point(dst_point), src_surface, wine_dbgstr_rect(src_rect)); - src_format = src_texture->resource.format; - dst_format = dst_texture->resource.format; - - if (src_format->id != dst_format->id) - { - WARN("Source and destination surfaces should have the same format.\n"); - return WINED3DERR_INVALIDCALL; - } - if (!dst_point) { p.x = 0; @@ -947,7 +936,7 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P src_texture->sub_resources[src_sub_resource_idx].locations); wined3d_texture_get_pitch(src_texture, src_surface->texture_level, &src_row_pitch, &src_slice_pitch); - wined3d_surface_upload_data(dst_surface, gl_info, src_format, src_rect, + wined3d_surface_upload_data(dst_surface, gl_info, src_texture->resource.format, src_rect, src_row_pitch, dst_point, FALSE, wined3d_const_bo_address(&data)); context_release(context);

1 0

Henri Verbeet : wined3d: Introduce a helper function to assign wined3d_box values.
by Alexandre Julliard April 7, 2017

April 7, 2017

Module: wine Branch: master Commit: df6120274d1a32e275a81308575f947945e89cd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df6120274d1a32e275a813085… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 6 23:44:30 2017 +0200 wined3d: Introduce a helper function to assign wined3d_box values. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 29 +++++-------------------- dlls/d3d8/surface.c | 7 +------ dlls/d3d8/texture.c | 14 ++----------- dlls/d3d9/device.c | 9 +------- dlls/d3d9/surface.c | 9 +------- dlls/d3d9/texture.c | 14 ++----------- dlls/ddraw/surface.c | 7 +------ dlls/wined3d/device.c | 57 +++++++++++--------------------------------------- include/wine/wined3d.h | 11 ++++++++++ 9 files changed, 36 insertions(+), 121 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=df6120274d1a32e275a81…

1 0

Stefan Dösinger : comctl32/tests: Don' t dump successful sequences on Windows.
by Alexandre Julliard April 7, 2017

April 7, 2017

Module: wine Branch: master Commit: 490d6f456b0a6869d5d044a842f00593021cc905 URL: http://source.winehq.org/git/wine.git/?a=commit;h=490d6f456b0a6869d5d044a84… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 7 16:02:01 2017 +0200 comctl32/tests: Don't dump successful sequences on Windows. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/msg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/msg.h b/dlls/comctl32/tests/msg.h index 3fa0fae..242d690 100644 --- a/dlls/comctl32/tests/msg.h +++ b/dlls/comctl32/tests/msg.h @@ -371,7 +371,7 @@ static void ok_sequence_(struct msg_sequence **seq, int sequence_index, if(todo && !failcount) /* succeeded yet marked todo */ { - dump++; + if (!strcmp(winetest_platform, "wine")) dump++; todo_wine { ok_(file, line)(TRUE, "%s: marked \"todo_wine\" but succeeds\n", context);

1 0

Józef Kucia : wined3d: Eliminate holes in wined3d_resource structure.
by Alexandre Julliard April 7, 2017

April 7, 2017

Module: wine Branch: master Commit: a48d7a275d33ba435f3808b2e97e582dbd4d38d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a48d7a275d33ba435f3808b2e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 7 14:45:14 2017 +0200 wined3d: Eliminate holes in wined3d_resource structure. 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/wined3d_private.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8ce3363..1641390 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2749,6 +2749,7 @@ struct wined3d_resource LONG ref; LONG bind_count; LONG map_count; + LONG access_count; struct wined3d_device *device; enum wined3d_resource_type type; enum wined3d_gl_resource_type gl_type; @@ -2759,20 +2760,20 @@ struct wined3d_resource DWORD usage; enum wined3d_pool pool; DWORD access_flags; - DWORD draw_binding; - DWORD map_binding; + WORD draw_binding; + WORD map_binding; UINT width; UINT height; UINT depth; UINT size; DWORD priority; void *heap_memory; - struct list resource_list_entry; - LONG access_count; void *parent; const struct wined3d_parent_ops *parent_ops; const struct wined3d_resource_ops *resource_ops; + + struct list resource_list_entry; }; static inline ULONG wined3d_resource_incref(struct wined3d_resource *resource)

1 0

Alexandre Julliard : include: Add a glu.h header.
by Alexandre Julliard April 7, 2017

April 7, 2017

Module: wine Branch: master Commit: 5fff9bcb63192eb93426add62126abc4701cf48b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fff9bcb63192eb93426add62… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 7 19:52:51 2017 +0200 include: Add a glu.h header. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/glu32/glu.c | 28 +----- dlls/opengl32/wgl.c | 28 +++--- include/wine/glu.h | 264 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 277 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5fff9bcb63192eb93426a…

1 0

Józef Kucia : wined3d: Eliminate holes in wined3d_shader_instruction structure.
by Alexandre Julliard April 7, 2017

April 7, 2017

Module: wine Branch: master Commit: 250f719749129fd81f3f1c74bc8190d3dd825c84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=250f719749129fd81f3f1c74b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 7 14:45:15 2017 +0200 wined3d: Eliminate holes in wined3d_shader_instruction structure. 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/wined3d_private.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1641390..761ef18 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1140,13 +1140,13 @@ struct wined3d_shader_instruction const struct wined3d_shader_context *ctx; enum WINED3D_SHADER_INSTRUCTION_HANDLER handler_idx; DWORD flags; - BOOL coissue; - const struct wined3d_shader_src_param *predicate; - UINT dst_count; + unsigned int dst_count; + unsigned int src_count; const struct wined3d_shader_dst_param *dst; - UINT src_count; const struct wined3d_shader_src_param *src; struct wined3d_shader_texel_offset texel_offset; + BOOL coissue; + const struct wined3d_shader_src_param *predicate; union { struct wined3d_shader_semantic semantic;

1 0

Józef Kucia : wined3d: Eliminate holes in wined3d_buffer structure.
by Alexandre Julliard April 7, 2017

April 7, 2017

Module: wine Branch: master Commit: e72d21cc2eb9e32fb0222d788a9074ee3f3bc309 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e72d21cc2eb9e32fb0222d788… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 7 14:45:13 2017 +0200 wined3d: Eliminate holes in wined3d_buffer structure. 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/wined3d_private.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 29a1d66..8ce3363 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3341,19 +3341,19 @@ struct wined3d_buffer GLenum buffer_type_hint; unsigned int bind_flags; DWORD flags; + DWORD locations; void *map_ptr; struct wined3d_map_range *maps; SIZE_T maps_size, modified_areas; - DWORD locations; struct wined3d_event_query *query; /* conversion stuff */ UINT decl_change_count, full_conversion_count; UINT draw_count; UINT stride; /* 0 if no conversion */ - UINT conversion_stride; /* 0 if no shifted conversion */ enum wined3d_buffer_conversion_type *conversion_map; /* NULL if no conversion */ + UINT conversion_stride; /* 0 if no shifted conversion */ }; static inline struct wined3d_buffer *buffer_from_resource(struct wined3d_resource *resource)

1 0

Józef Kucia : wined3d: Use wined3d_texture_get_texture_name() helper in more places.
by Alexandre Julliard April 7, 2017

April 7, 2017

Module: wine Branch: master Commit: a727b74264cfe8c78b194b2bb20889e729cc664e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a727b74264cfe8c78b194b2bb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 7 14:45:11 2017 +0200 wined3d: Use wined3d_texture_get_texture_name() helper in more places. 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 | 2 +- dlls/wined3d/view.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index c74f7c0..7c090d4 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3553,7 +3553,7 @@ static void context_bind_unordered_access_views(struct wined3d_context *context, else if (view->resource->type != WINED3D_RTYPE_BUFFER) { struct wined3d_texture *texture = texture_from_resource(view->resource); - texture_name = wined3d_texture_get_gl_texture(texture, FALSE)->name; + texture_name = wined3d_texture_get_texture_name(texture, context, FALSE); level = view->desc.u.texture.level_idx; } else diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index f37b601..7e8d192 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -153,7 +153,7 @@ static void create_texture_view(struct wined3d_gl_view *view, GLenum view_target const struct wined3d_gl_info *gl_info; unsigned int layer_idx, layer_count; struct wined3d_context *context; - struct gl_texture *gl_texture; + GLuint texture_name; view->target = view_target; @@ -168,7 +168,7 @@ static void create_texture_view(struct wined3d_gl_view *view, GLenum view_target } wined3d_texture_prepare_texture(texture, context, FALSE); - gl_texture = wined3d_texture_get_gl_texture(texture, FALSE); + texture_name = wined3d_texture_get_texture_name(texture, context, FALSE); layer_idx = desc->u.texture.layer_idx; layer_count = desc->u.texture.layer_count; @@ -180,7 +180,7 @@ static void create_texture_view(struct wined3d_gl_view *view, GLenum view_target } gl_info->gl_ops.gl.p_glGenTextures(1, &view->name); - GL_EXTCALL(glTextureView(view->name, view->target, gl_texture->name, view_format->glInternal, + GL_EXTCALL(glTextureView(view->name, view->target, texture_name, view_format->glInternal, desc->u.texture.level_idx, desc->u.texture.level_count, layer_idx, layer_count)); checkGLcall("Create texture view");

1 0

Henri Verbeet : wined3d: Implement partial support for 3D texture blits.
by Alexandre Julliard April 7, 2017

April 7, 2017

Module: wine Branch: master Commit: 986e3eebceb3d890a215eb2c641ea871f0d51820 URL: http://source.winehq.org/git/wine.git/?a=commit;h=986e3eebceb3d890a215eb2c6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 6 23:44:33 2017 +0200 wined3d: Implement partial support for 3D texture blits. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 78a3e1d..0866a16 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1759,6 +1759,88 @@ static void wined3d_cs_exec_blt_sub_resource(struct wined3d_cs *cs, const void * &src_rect, op->flags, &op->fx, op->filter))) FIXME("Blit failed.\n"); } + else if (op->dst_resource->type == WINED3D_RTYPE_TEXTURE_3D) + { + struct wined3d_texture *src_texture, *dst_texture; + unsigned int level, update_w, update_h, update_d; + unsigned int row_pitch, slice_pitch; + struct wined3d_context *context; + struct wined3d_bo_address addr; + + if (op->flags) + { + FIXME("Flags %#x not implemented for %s resources.\n", + op->flags, debug_d3dresourcetype(op->dst_resource->type)); + return; + } + + if (op->src_resource->format != op->dst_resource->format) + { + FIXME("Format conversion not implemented for %s resources.\n", + debug_d3dresourcetype(op->dst_resource->type)); + return; + } + + update_w = op->dst_box.right - op->dst_box.left; + update_h = op->dst_box.bottom - op->dst_box.top; + update_d = op->dst_box.back - op->dst_box.front; + if (op->src_box.right - op->src_box.left != update_w + || op->src_box.bottom - op->src_box.top != update_h + || op->src_box.back - op->src_box.front != update_d) + { + FIXME("Stretching not implemented for %s resources.\n", + debug_d3dresourcetype(op->dst_resource->type)); + return; + } + + if (op->src_box.left || op->src_box.top || op->src_box.front) + { + FIXME("Source box %s not supported for %s resources.\n", + debug_box(&op->src_box), debug_d3dresourcetype(op->dst_resource->type)); + return; + } + + dst_texture = texture_from_resource(op->dst_resource); + src_texture = texture_from_resource(op->src_resource); + + context = context_acquire(cs->device, NULL, 0); + + if (!wined3d_texture_load_location(src_texture, op->src_sub_resource_idx, + context, src_texture->resource.map_binding)) + { + ERR("Failed to load source sub-resource into %s.\n", + wined3d_debug_location(src_texture->resource.map_binding)); + context_release(context); + return; + } + + level = op->dst_sub_resource_idx % dst_texture->level_count; + if (update_w == wined3d_texture_get_level_width(dst_texture, level) + && update_h == wined3d_texture_get_level_height(dst_texture, level) + && update_d == wined3d_texture_get_level_depth(dst_texture, level)) + { + wined3d_texture_prepare_texture(dst_texture, context, FALSE); + } + else if (!wined3d_texture_load_location(dst_texture, op->dst_sub_resource_idx, + context, WINED3D_LOCATION_TEXTURE_RGB)) + { + ERR("Failed to load destination sub-resource.\n"); + context_release(context); + return; + } + + wined3d_texture_get_memory(src_texture, op->src_sub_resource_idx, &addr, src_texture->resource.map_binding); + wined3d_texture_get_pitch(src_texture, op->src_sub_resource_idx % src_texture->level_count, + &row_pitch, &slice_pitch); + + wined3d_texture_bind_and_dirtify(dst_texture, context, FALSE); + wined3d_texture_upload_data(dst_texture, op->dst_sub_resource_idx, context, &op->dst_box, + wined3d_const_bo_address(&addr), row_pitch, slice_pitch); + wined3d_texture_validate_location(dst_texture, op->dst_sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB); + wined3d_texture_invalidate_location(dst_texture, op->dst_sub_resource_idx, ~WINED3D_LOCATION_TEXTURE_RGB); + + context_release(context); + } else { FIXME("Not implemented for %s resources.\n", debug_d3dresourcetype(op->dst_resource->type));

1 0