wine-devel March 2018

wine-devel@winehq.org

90 participants
798 discussions

Student preparing for GSoC
by Kieran Duggan 22 Mar '18

22 Mar '18

Hello, I am a computer science student at the City College of New York. I have used Linux for a few years now and have frequently relied on Wine to run windows applications, so the opportunity to contribute to Wine is exciting to me. I have successfully built wine from source and ran Ski Free on it to test if it worked. Next I wanted to try and find some of the fixmes that were popping up so I could attempt my first patch, however I am having trouble finding where exactly in the source the fixme's are arising. Maybe It's obvious and I'm just too tired right now to figure it out, but I would be very appreciative if someone could point me in the right direction with this. While I have been learning computer science for years now, I have not yet contributed to an open source project. I am very eager to learn and become familiar with the process. Thank you! Kieran Duggan

4 7

[PATCH] winex11.drv: Fix compile error when Vulkan isn't avaiable
by Alistair Leslie-Hughes 21 Mar '18

21 Mar '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/winex11.drv/vulkan.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index 27ff722..f96ef64 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -37,10 +37,10 @@ #include "wine/vulkan.h" #include "wine/vulkan_driver.h" -#ifdef SONAME_LIBVULKAN - WINE_DEFAULT_DEBUG_CHANNEL(vulkan); +#ifdef SONAME_LIBVULKAN + typedef VkFlags VkXlibSurfaceCreateFlagsKHR; #define VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR 1000004000 -- 1.9.1

1 0

[PATCH 5/5] usp10: Merge GSUB_initialize_language_cache() and GPOS_expand_language_cache().
by Henri Verbeet 21 Mar '18

21 Mar '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/usp10/opentype.c | 97 ++++++++++++++++----------------------------- dlls/usp10/usp10_internal.h | 10 ++++- 2 files changed, 42 insertions(+), 65 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 299c301758c..88272656038 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -2705,86 +2705,57 @@ static LoadedLanguage *usp10_script_get_language(LoadedScript *script, OPENTYPE_ return NULL; } -static void GSUB_initialize_language_cache(LoadedScript *script) -{ - const OT_Script *table; - DWORD offset; - SIZE_T i; - - if (!(table = script->table[USP10_SCRIPT_TABLE_GSUB])) - return; - - if ((offset = GET_BE_WORD(table->DefaultLangSys))) - { - script->default_language.tag = MS_MAKE_TAG('d','f','l','t'); - script->default_language.gsub_table = (const BYTE *)table + offset; - } - - if (!(script->language_count = GET_BE_WORD(table->LangSysCount))) - return; - - TRACE("Deflang %p, LangCount %lu.\n", script->default_language.gsub_table, script->language_count); - - if (!usp10_array_reserve((void **)&script->languages, &script->languages_size, - script->language_count, sizeof(*script->languages))) - { - ERR("Failed to grow languages array.\n"); - return; - } - - for (i = 0; i < script->language_count; ++i) - { - script->languages[i].tag = MS_MAKE_TAG(table->LangSysRecord[i].LangSysTag[0], - table->LangSysRecord[i].LangSysTag[1], - table->LangSysRecord[i].LangSysTag[2], - table->LangSysRecord[i].LangSysTag[3]); - script->languages[i].gsub_table = (const BYTE *)table + GET_BE_WORD(table->LangSysRecord[i].LangSys); - } -} - -static void GPOS_expand_language_cache(LoadedScript *script) +static void usp10_script_add_language_list(LoadedScript *script, + enum usp10_language_table table, const OT_Script *list) { SIZE_T initial_count, count, i; LoadedLanguage *language; - const OT_Script *table; OPENTYPE_TAG tag; DWORD offset; - if (!(table = script->table[USP10_SCRIPT_TABLE_GPOS])) - return; + TRACE("script %p, table %#x, list %p.\n", script, table, list); - if ((offset = GET_BE_WORD(table->DefaultLangSys))) - script->default_language.gpos_table = (const BYTE *)table + offset; + if ((offset = GET_BE_WORD(list->DefaultLangSys))) + { + script->default_language.tag = MS_MAKE_TAG('d','f','l','t'); + script->default_language.table[table] = (const BYTE *)list + offset; + TRACE("Default language %p.\n", script->default_language.table[table]); + } - if (!(count = GET_BE_WORD(table->LangSysCount))) + if (!(count = GET_BE_WORD(list->LangSysCount))) return; - TRACE("Deflang %p, LangCount %lu.\n", script->default_language.gpos_table, count); + TRACE("Adding %lu languages.\n", count); initial_count = script->language_count; for (i = 0; i < count; ++i) { - tag = MS_MAKE_TAG(table->LangSysRecord[i].LangSysTag[0], - table->LangSysRecord[i].LangSysTag[1], - table->LangSysRecord[i].LangSysTag[2], - table->LangSysRecord[i].LangSysTag[3]); + tag = MS_MAKE_TAG(list->LangSysRecord[i].LangSysTag[0], + list->LangSysRecord[i].LangSysTag[1], + list->LangSysRecord[i].LangSysTag[2], + list->LangSysRecord[i].LangSysTag[3]); if (!(initial_count && (language = usp10_script_get_language(script, tag))) && !(language = usp10_script_add_language(script, tag))) return; - language->gpos_table = (const BYTE *)table + GET_BE_WORD(table->LangSysRecord[i].LangSys); + language->table[table] = (const BYTE *)list + GET_BE_WORD(list->LangSysRecord[i].LangSys); } } static void _initialize_language_cache(LoadedScript *script) { - if (!script->languages_initialized) - { - GSUB_initialize_language_cache(script); - GPOS_expand_language_cache(script); - script->languages_initialized = TRUE; - } + const OT_Script *list; + + if (script->languages_initialized) + return; + + if ((list = script->table[USP10_SCRIPT_TABLE_GSUB])) + usp10_script_add_language_list(script, USP10_LANGUAGE_TABLE_GSUB, list); + if ((list = script->table[USP10_SCRIPT_TABLE_GPOS])) + usp10_script_add_language_list(script, USP10_LANGUAGE_TABLE_GPOS, list); + + script->languages_initialized = TRUE; } HRESULT OpenType_GetFontLanguageTags(ScriptCache *psc, OPENTYPE_TAG script_tag, OPENTYPE_TAG searchingFor, int cMaxTags, OPENTYPE_TAG *pLanguageTags, int *pcTags) @@ -2823,7 +2794,7 @@ HRESULT OpenType_GetFontLanguageTags(ScriptCache *psc, OPENTYPE_TAG script_tag, } } - if (script->default_language.gsub_table) + if (script->default_language.table[USP10_LANGUAGE_TABLE_GSUB]) { if (i < cMaxTags) pLanguageTags[i] = script->default_language.tag; @@ -2888,13 +2859,13 @@ static void _initialize_feature_cache(ScriptCache *psc, LoadedLanguage *language if (language->features_initialized) return; - if ((lang = language->gsub_table)) + if ((lang = language->table[USP10_LANGUAGE_TABLE_GSUB])) { feature_list = (const OT_FeatureList *)((const BYTE *)gsub_header + GET_BE_WORD(gsub_header->FeatureList)); usp10_language_add_feature_list(language, FEATURE_GSUB_TABLE, lang, feature_list); } - if ((lang = language->gpos_table)) + if ((lang = language->table[USP10_LANGUAGE_TABLE_GPOS])) { feature_list = (const OT_FeatureList *)((const BYTE *)gpos_header + GET_BE_WORD(gpos_header->FeatureList)); usp10_language_add_feature_list(language, FEATURE_GPOS_TABLE, lang, feature_list); @@ -2906,9 +2877,9 @@ static void _initialize_feature_cache(ScriptCache *psc, LoadedLanguage *language HRESULT OpenType_GetFontFeatureTags(ScriptCache *psc, OPENTYPE_TAG script_tag, OPENTYPE_TAG language_tag, BOOL filtered, OPENTYPE_TAG searchingFor, char tableType, int cMaxTags, OPENTYPE_TAG *pFeatureTags, int *pcTags, LoadedFeature** feature) { int i; + LoadedLanguage *language; LoadedScript *script; HRESULT rc = S_OK; - LoadedLanguage *language = NULL; _initialize_script_cache(psc); if (!(script = usp10_script_cache_get_script(psc, script_tag))) @@ -2922,9 +2893,9 @@ HRESULT OpenType_GetFontFeatureTags(ScriptCache *psc, OPENTYPE_TAG script_tag, O _initialize_language_cache(script); - if ((script->default_language.gsub_table || script->default_language.gpos_table) && script->default_language.tag == language_tag) - language = &script->default_language; - else + language = &script->default_language; + if (language->tag != language_tag || (!language->table[USP10_LANGUAGE_TABLE_GSUB] + && !language->table[USP10_LANGUAGE_TABLE_GPOS])) language = usp10_script_get_language(script, language_tag); if (!language) diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 08024c90227..99d7cd11b11 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -152,10 +152,16 @@ typedef struct { WORD *lookups; } LoadedFeature; +enum usp10_language_table +{ + USP10_LANGUAGE_TABLE_GSUB = 0, + USP10_LANGUAGE_TABLE_GPOS, + USP10_LANGUAGE_TABLE_COUNT +}; + typedef struct { OPENTYPE_TAG tag; - const void *gsub_table; - const void *gpos_table; + const void *table[USP10_LANGUAGE_TABLE_COUNT]; BOOL features_initialized; INT feature_count; LoadedFeature *features; -- 2.11.0

2 1

[PATCH 5/5] usp10: Simplify GPOS_expand_language_cache().
by Henri Verbeet 21 Mar '18

21 Mar '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/usp10/opentype.c | 79 +++++++++++++++++++++++---------------------------- 1 file changed, 35 insertions(+), 44 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 49a88a6991d..299c301758c 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -2675,6 +2675,23 @@ HRESULT OpenType_GetFontScriptTags(ScriptCache *psc, OPENTYPE_TAG searchingFor, return rc; } +static LoadedLanguage *usp10_script_add_language(LoadedScript *script, OPENTYPE_TAG tag) +{ + LoadedLanguage *language; + + if (!usp10_array_reserve((void **)&script->languages, &script->languages_size, + script->language_count + 1, sizeof(*script->languages))) + { + ERR("Failed to grow languages array.\n"); + return NULL; + } + + language = &script->languages[script->language_count++]; + language->tag = tag; + + return language; +} + static LoadedLanguage *usp10_script_get_language(LoadedScript *script, OPENTYPE_TAG tag) { size_t i; @@ -2727,62 +2744,36 @@ static void GSUB_initialize_language_cache(LoadedScript *script) static void GPOS_expand_language_cache(LoadedScript *script) { - int count; - const OT_Script *table = script->table[USP10_SCRIPT_TABLE_GPOS]; + SIZE_T initial_count, count, i; LoadedLanguage *language; + const OT_Script *table; + OPENTYPE_TAG tag; DWORD offset; - if (!table) + if (!(table = script->table[USP10_SCRIPT_TABLE_GPOS])) return; - offset = GET_BE_WORD(table->DefaultLangSys); - if (offset) - script->default_language.gpos_table = (const BYTE*)table + offset; - - count = GET_BE_WORD(table->LangSysCount); - - TRACE("Deflang %p, LangCount %i\n",script->default_language.gpos_table, count); + if ((offset = GET_BE_WORD(table->DefaultLangSys))) + script->default_language.gpos_table = (const BYTE *)table + offset; - if (!count) + if (!(count = GET_BE_WORD(table->LangSysCount))) return; - if (!script->language_count) - { - int i; - script->language_count = count; - - script->languages = heap_alloc_zero(script->language_count * sizeof(*script->languages)); + TRACE("Deflang %p, LangCount %lu.\n", script->default_language.gpos_table, count); - for (i = 0; i < script->language_count; i++) - { - int offset = GET_BE_WORD(table->LangSysRecord[i].LangSys); - script->languages[i].tag = MS_MAKE_TAG(table->LangSysRecord[i].LangSysTag[0], table->LangSysRecord[i].LangSysTag[1], table->LangSysRecord[i].LangSysTag[2], table->LangSysRecord[i].LangSysTag[3]); - script->languages[i].gpos_table = ((const BYTE*)table + offset); - } - } - else if (count) + initial_count = script->language_count; + for (i = 0; i < count; ++i) { - int i; - for (i = 0; i < count; i++) - { - int offset = GET_BE_WORD(table->LangSysRecord[i].LangSys); - OPENTYPE_TAG tag = MS_MAKE_TAG(table->LangSysRecord[i].LangSysTag[0], table->LangSysRecord[i].LangSysTag[1], table->LangSysRecord[i].LangSysTag[2], table->LangSysRecord[i].LangSysTag[3]); + tag = MS_MAKE_TAG(table->LangSysRecord[i].LangSysTag[0], + table->LangSysRecord[i].LangSysTag[1], + table->LangSysRecord[i].LangSysTag[2], + table->LangSysRecord[i].LangSysTag[3]); - if (!(language = usp10_script_get_language(script, tag))) - { - if (!usp10_array_reserve((void **)&script->languages, &script->languages_size, - script->language_count + 1, sizeof(*script->languages))) - { - ERR("Failed grow languages array.\n"); - return; - } + if (!(initial_count && (language = usp10_script_get_language(script, tag))) + && !(language = usp10_script_add_language(script, tag))) + return; - language = &script->languages[script->language_count]; - ++script->language_count; - language->tag = tag; - } - language->gpos_table = (const BYTE *)table + offset; - } + language->gpos_table = (const BYTE *)table + GET_BE_WORD(table->LangSysRecord[i].LangSys); } } -- 2.11.0

2 1

[PATCH 1/2] user32/tests: Drop broadcast test workaround for Windows NT4
by Alex Henrie 21 Mar '18

21 Mar '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- I missed this one the first time around. dlls/user32/tests/broadcast.c | 35 +++++++++++++++-------------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/dlls/user32/tests/broadcast.c b/dlls/user32/tests/broadcast.c index 5869119a69..afdb536816 100644 --- a/dlls/user32/tests/broadcast.c +++ b/dlls/user32/tests/broadcast.c @@ -138,26 +138,21 @@ if (0) /* TODO: Check the hang flags */ SetLastError( 0xdeadbeef ); recips = BSM_APPLICATIONS; ret = broadcast( BSF_POSTMESSAGE|BSF_SENDNOTIFYMESSAGE, &recips, WM_NULL, 100, 0 ); - if (ret) - { - ok(ret==1, "Returned: %d\n", ret); - ok(WaitForSingleObject(hevent, 0) != WAIT_OBJECT_0, "Synchronous message sent instead\n"); - PulseEvent(hevent); - - recips = BSM_APPLICATIONS; - ret = broadcast( BSF_SENDNOTIFYMESSAGE, &recips, WM_NULL, 100, BROADCAST_QUERY_DENY ); - ok(ret==1, "Returned: %d\n", ret); - ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT, "Asynchronous message sent instead\n"); - PulseEvent(hevent); - - recips = BSM_APPLICATIONS; - ret = broadcast( BSF_SENDNOTIFYMESSAGE|BSF_QUERY, &recips, WM_NULL, 100, BROADCAST_QUERY_DENY ); - ok(!ret, "Returned: %d\n", ret); - ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT, "Asynchronous message sent instead\n"); - PulseEvent(hevent); - } - else /* BSF_SENDNOTIFYMESSAGE not supported on NT4 */ - ok( GetLastError() == ERROR_INVALID_PARAMETER, "failed with err %u\n", GetLastError() ); + ok(ret==1, "Returned: %d\n", ret); + ok(WaitForSingleObject(hevent, 0) != WAIT_OBJECT_0, "Synchronous message sent instead\n"); + PulseEvent(hevent); + + recips = BSM_APPLICATIONS; + ret = broadcast( BSF_SENDNOTIFYMESSAGE, &recips, WM_NULL, 100, BROADCAST_QUERY_DENY ); + ok(ret==1, "Returned: %d\n", ret); + ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT, "Asynchronous message sent instead\n"); + PulseEvent(hevent); + + recips = BSM_APPLICATIONS; + ret = broadcast( BSF_SENDNOTIFYMESSAGE|BSF_QUERY, &recips, WM_NULL, 100, BROADCAST_QUERY_DENY ); + ok(!ret, "Returned: %d\n", ret); + ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT, "Asynchronous message sent instead\n"); + PulseEvent(hevent); recips = BSM_APPLICATIONS; ret = broadcast( 0, &recips, WM_NULL, 100, 0 ); -- 2.16.2

2 3

WineTest cw1 and cw2 Linux update
by Francois Gouget 21 Mar '18

21 Mar '18

On monday I upgraded cw1-hd6800 and cw2-gtx560 to Debian 9.4. That went smoothly (unlike the vm1 and vm2 upgrade) and it does not seem to have upset the WineTest results much. If you look at the March 9 results you can see both the pre and post upgrade WineTest results (I reran the tests before the monday 12 commits). https://test.winehq.org/data/dfde1195385df5ddb11f1104a0e744596b99477f/index… Only d3d9:device seems to have new failures, and only on cw1-hd6800: device.c:1808: Test failed: The cursor handle is 0x10022 However this failure had happened on cw2-gtx560 before the upgrade so it's not entirely new. https://test.winehq.org/data/661791cb7ea3757655aeff4fb061ada27a88cecc/linux… https://test.winehq.org/data/acd2f1e59bd22197b63eb5ae4ac0d621a0b8cce0/linux… user32:win also has new failures but those started on the 9th before I upgraded cw1 and cw2. The other differences I saw all seem to be related to random bugs that pop up from time to time. But now is the time to check for yourself. -- Francois Gouget <fgouget(a)codeweavers.com>

1 1

[PATCH] user32: Remove some misleading TODOs
by Nikolay Sivov 21 Mar '18

21 Mar '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user32/button.c | 16 ---------------- dlls/user32/combo.c | 2 -- dlls/user32/edit.c | 5 ----- 3 files changed, 23 deletions(-) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index 0f56e4e51d..adfb6a91ff 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -28,30 +28,14 @@ * - WM_SETFOCUS: For (manual or automatic) radio buttons, send the parent window BN_CLICKED * - WM_NCCREATE: Turns any BS_OWNERDRAW button into a BS_PUSHBUTTON button. * - WM_SYSKEYUP - * - BCM_GETIDEALSIZE - * - BCM_GETIMAGELIST - * - BCM_GETTEXTMARGIN - * - BCM_SETIMAGELIST - * - BCM_SETTEXTMARGIN * * Notifications - * - BCN_HOTITEMCHANGE * - BN_DISABLE * - BN_PUSHED/BN_HILITE * + BN_KILLFOCUS: is it OK? * - BN_PAINT * + BN_SETFOCUS: is it OK? * - BN_UNPUSHED/BN_UNHILITE - * - NM_CUSTOMDRAW - * - * Structures/Macros/Definitions - * - BUTTON_IMAGELIST - * - NMBCHOTITEM - * - Button_GetIdealSize - * - Button_GetImageList - * - Button_GetTextMargin - * - Button_SetImageList - * - Button_SetTextMargin */ #include <stdarg.h> diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index ef75c7637e..dcfa661f97 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * TODO: - * - ComboBox_[GS]etMinVisible() - * - CB_GETMINVISIBLE, CB_SETMINVISIBLE * - CB_SETTOPINDEX */ diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 693c58f6f8..96ecbece85 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -21,11 +21,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * TODO: - * - EDITBALLOONTIP structure - * - EM_GETCUEBANNER/Edit_GetCueBannerText - * - EM_HIDEBALLOONTIP/Edit_HideBalloonTip - * - EM_SETCUEBANNER/Edit_SetCueBannerText - * - EM_SHOWBALLOONTIP/Edit_ShowBalloonTip * - EM_GETIMESTATUS, EM_SETIMESTATUS * - EN_ALIGN_LTR_EC * - EN_ALIGN_RTL_EC -- 2.16.2

1 0

[PATCH 01/10] d3dx9: Introduce a parameter rbtree to speed up get_parameter_by_name().
by Matteo Bruni 21 Mar '18

21 Mar '18

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3dx9_36/d3dx9_private.h | 12 ++++ dlls/d3dx9_36/effect.c | 156 ++++++++++++++++++++++++++++++++++++++---- 2 files changed, 155 insertions(+), 13 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h index 5ac5e63aeb6..2044b2af448 100644 --- a/dlls/d3dx9_36/d3dx9_private.h +++ b/dlls/d3dx9_36/d3dx9_private.h @@ -24,6 +24,8 @@ #define NONAMELESSUNION #include "wine/debug.h" +#include "wine/heap.h" +#include "wine/rbtree.h" #define COBJMACROS #include "d3dx9.h" @@ -278,6 +280,13 @@ struct d3dx_param_eval ULONG64 *version_counter; }; +struct param_rb_entry +{ + struct wine_rb_entry entry; + char *full_name; + struct d3dx_parameter *param; +}; + struct d3dx_shared_data; struct d3dx_top_level_parameter; @@ -300,6 +309,9 @@ struct d3dx_parameter struct d3dx_parameter *members; char *semantic; + + char *full_name; + struct wine_rb_entry rb_entry; }; struct d3dx_top_level_parameter diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 87eaf8684a9..340f3d3fd00 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -20,6 +20,8 @@ #include "config.h" #include "wine/port.h" +#include <stdio.h> + #include "d3dx9_private.h" #include "d3dcompiler.h" @@ -161,6 +163,10 @@ struct d3dx9_base_effect DWORD flags; ULONG64 version_counter; + + struct wine_rb_tree param_tree; + char *full_name_tmp; + unsigned int full_name_tmp_size; }; struct ID3DXEffectImpl @@ -205,8 +211,8 @@ struct ID3DXEffectCompilerImpl struct d3dx9_base_effect base_effect; }; -static struct d3dx_parameter *get_annotation_by_name(UINT count, struct d3dx_parameter *parameters, - const char *name); +static struct d3dx_parameter *get_annotation_by_name(struct d3dx9_base_effect *base, + unsigned int count, struct d3dx_parameter *parameters, const char *name); static HRESULT d3dx9_parse_state(struct d3dx9_base_effect *base, struct d3dx_state *state, const char *data, const char **ptr, struct d3dx_object *objects); static void free_parameter(struct d3dx_parameter *param, BOOL element, BOOL child); @@ -682,6 +688,8 @@ static void d3dx9_base_effect_cleanup(struct d3dx9_base_effect *base) TRACE("base %p.\n", base); + heap_free(base->full_name_tmp); + if (base->parameters) { for (i = 0; i < base->parameter_count; ++i) @@ -814,7 +822,8 @@ static void set_matrix_transpose(struct d3dx_parameter *param, const D3DXMATRIX } } -static struct d3dx_parameter *get_parameter_element_by_name(struct d3dx_parameter *parameter, const char *name) +static struct d3dx_parameter *get_parameter_element_by_name(struct d3dx9_base_effect *base, + struct d3dx_parameter *parameter, const char *name) { UINT element; struct d3dx_parameter *temp_parameter; @@ -835,7 +844,7 @@ static struct d3dx_parameter *get_parameter_element_by_name(struct d3dx_paramete switch (*part++) { case '.': - return get_parameter_by_name(NULL, temp_parameter, part); + return get_parameter_by_name(base, temp_parameter, part); case '\0': TRACE("Returning parameter %p\n", temp_parameter); @@ -851,8 +860,8 @@ static struct d3dx_parameter *get_parameter_element_by_name(struct d3dx_paramete return NULL; } -static struct d3dx_parameter *get_annotation_by_name(UINT count, struct d3dx_parameter *annotations, - const char *name) +static struct d3dx_parameter *get_annotation_by_name(struct d3dx9_base_effect *base, + unsigned int count, struct d3dx_parameter *annotations, const char *name) { UINT i, length; struct d3dx_parameter *temp_parameter; @@ -879,10 +888,10 @@ static struct d3dx_parameter *get_annotation_by_name(UINT count, struct d3dx_par switch (*part++) { case '.': - return get_parameter_by_name(NULL, temp_parameter, part); + return get_parameter_by_name(base, temp_parameter, part); case '[': - return get_parameter_element_by_name(temp_parameter, part); + return get_parameter_element_by_name(base, temp_parameter, part); default: FIXME("Unhandled case \"%c\"\n", *--part); @@ -898,15 +907,57 @@ static struct d3dx_parameter *get_annotation_by_name(UINT count, struct d3dx_par struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *base, struct d3dx_parameter *parameter, const char *name) { - UINT i, count, length; struct d3dx_parameter *temp_parameter; + unsigned int name_len, param_name_len; + unsigned int i, count, length; + struct wine_rb_entry *entry; + unsigned int full_name_size; const char *part; + char *full_name; TRACE("base %p, parameter %p, name %s\n", base, parameter, debugstr_a(name)); if (!name || !*name) return NULL; + if (!parameter) + { + if ((entry = wine_rb_get(&base->param_tree, name))) + return WINE_RB_ENTRY_VALUE(entry, struct d3dx_parameter, rb_entry); + return NULL; + } + + /* Pass / technique annotations are not in the parameters tree. */ + if (parameter->full_name) + { + name_len = strlen(name); + param_name_len = strlen(parameter->full_name); + full_name_size = name_len + param_name_len + 2; + if (base->full_name_tmp_size < full_name_size) + { + if (!(full_name = heap_realloc(base->full_name_tmp, full_name_size))) + { + ERR("Out of memory.\n"); + return NULL; + } + base->full_name_tmp = full_name; + base->full_name_tmp_size = full_name_size; + } + else + { + full_name = base->full_name_tmp; + } + memcpy(full_name, parameter->full_name, param_name_len); + full_name[param_name_len] = '.'; + memcpy(full_name + param_name_len + 1, name, name_len); + full_name[param_name_len + 1 + name_len] = 0; + + if ((entry = wine_rb_get(&base->param_tree, full_name))) + return WINE_RB_ENTRY_VALUE(entry, struct d3dx_parameter, rb_entry); + return NULL; + } + count = parameter ? parameter->member_count : base->parameter_count; + length = strcspn( name, "[.@" ); part = name + length; @@ -925,18 +976,18 @@ struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *base, switch (*part++) { case '.': - return get_parameter_by_name(NULL, temp_parameter, part); + return get_parameter_by_name(base, temp_parameter, part); case '@': { struct d3dx_top_level_parameter *top_param = top_level_parameter_from_parameter(temp_parameter); - return parameter ? NULL : get_annotation_by_name(top_param->annotation_count, + return parameter ? NULL : get_annotation_by_name(base, top_param->annotation_count, top_param->annotations, part); } case '[': - return get_parameter_element_by_name(temp_parameter, part); + return get_parameter_element_by_name(base, temp_parameter, part); default: FIXME("Unhandled case \"%c\"\n", *--part); @@ -1460,7 +1511,7 @@ static D3DXHANDLE d3dx9_base_effect_get_annotation_by_name(struct d3dx9_base_eff annotation_count = get_annotation_from_object(base, object, &annotations); - annotation = get_annotation_by_name(annotation_count, annotations, name); + annotation = get_annotation_by_name(base, annotation_count, annotations, name); if (annotation) { TRACE("Returning parameter %p\n", annotation); @@ -5436,6 +5487,83 @@ static void param_set_magic_number(struct d3dx_parameter *param) memcpy(param->magic_string, parameter_magic_string, sizeof(parameter_magic_string)); } +static int param_rb_compare(const void *key, const struct wine_rb_entry *entry) +{ + const char *name = key; + struct d3dx_parameter *param = WINE_RB_ENTRY_VALUE(entry, struct d3dx_parameter, rb_entry); + + return strcmp(name, param->full_name); +} + +static void add_param_to_tree(struct d3dx9_base_effect *base, struct d3dx_parameter *param, + struct d3dx_parameter *parent, char separator, unsigned int element) +{ + const char *parent_name = parent ? parent->full_name : NULL; + unsigned int i; + + TRACE("Adding parameter %p (%s - parent %p, element %u) to the rbtree.\n", + param, debugstr_a(param->name), parent, element); + + if (parent_name) + { + unsigned int parent_name_len = strlen(parent_name); + unsigned int name_len = strlen(param->name); + unsigned int part_str_len; + unsigned int len; + char part_str[16]; + + if (separator == '[') + { + sprintf(part_str, "[%u]", element); + part_str_len = strlen(part_str); + name_len = 0; + } + else + { + part_str[0] = separator; + part_str[1] = 0; + part_str_len = 1; + } + len = parent_name_len + part_str_len + name_len + 1; + + if (!(param->full_name = heap_alloc(len))) + { + ERR("Out of memory.\n"); + return; + } + + memcpy(param->full_name, parent_name, parent_name_len); + memcpy(param->full_name + parent_name_len, part_str, part_str_len); + memcpy(param->full_name + parent_name_len + part_str_len, param->name, name_len); + param->full_name[len - 1] = 0; + } + else + { + unsigned int len = strlen(param->name) + 1; + + if (!(param->full_name = heap_alloc(len))) + { + ERR("Out of memory.\n"); + return; + } + + memcpy(param->full_name, param->name, len); + } + TRACE("Full name is %s.\n", param->full_name); + wine_rb_put(&base->param_tree, param->full_name, &param->rb_entry); + + if (is_top_level_parameter(param)) + for (i = 0; i < param->top_level_param->annotation_count; ++i) + add_param_to_tree(base, &param->top_level_param->annotations[i], param, '@', 0); + + if (param->element_count) + for (i = 0; i < param->element_count; ++i) + add_param_to_tree(base, &param->members[i], param, '[', i); + else + for (i = 0; i < param->member_count; ++i) + add_param_to_tree(base, &param->members[i], param, '.', 0); +} + static HRESULT d3dx9_parse_effect_typedef(struct d3dx9_base_effect *base, struct d3dx_parameter *param, const char *data, const char **ptr, struct d3dx_parameter *parent, UINT flags) { @@ -6281,6 +6409,7 @@ static HRESULT d3dx9_parse_effect(struct d3dx9_base_effect *base, const char *da goto err_out; } + wine_rb_init(&base->param_tree, param_rb_compare); if (base->parameter_count) { base->parameters = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, @@ -6303,6 +6432,7 @@ static HRESULT d3dx9_parse_effect(struct d3dx9_base_effect *base, const char *da } walk_parameter_tree(&base->parameters[i].param, param_set_top_level_param, &base->parameters[i]); + add_param_to_tree(base, &base->parameters[i].param, NULL, 0, 0); } } -- 2.13.6

4 12

[PATCH 4/5] wined3d: Merge texture2d_upload_data() and texture3d_upload_data().
by Henri Verbeet 21 Mar '18

21 Mar '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/texture.c | 169 ++++++++++++----------------------------- dlls/wined3d/wined3d_private.h | 4 - 2 files changed, 49 insertions(+), 124 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index be40e7135b0..187e2a246b6 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1744,19 +1744,10 @@ HRESULT CDECL wined3d_texture_add_dirty_region(struct wined3d_texture *texture, return WINED3D_OK; } -void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, - struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *src_box, - const struct wined3d_const_bo_address *data, unsigned int row_pitch, unsigned int slice_pitch, - unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, BOOL srgb) -{ - texture->texture_ops->texture_upload_data(texture, sub_resource_idx, context, - format, src_box, data, row_pitch, slice_pitch, dst_x, dst_y, dst_z, srgb); -} - /* This call just uploads data, the caller is responsible for binding the * correct texture. */ /* Context activation is done by the caller. */ -static void texture2d_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, +void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *src_box, const struct wined3d_const_bo_address *data, unsigned int src_row_pitch, unsigned int src_slice_pitch, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, BOOL srgb) @@ -1764,10 +1755,11 @@ static void texture2d_upload_data(struct wined3d_texture *texture, unsigned int const struct wined3d_gl_info *gl_info = context->gl_info; unsigned int update_w = src_box->right - src_box->left; unsigned int update_h = src_box->bottom - src_box->top; + unsigned int update_d = src_box->back - src_box->front; struct wined3d_bo_address bo; void *converted_mem = NULL; - unsigned int level, layer; struct wined3d_format f; + unsigned int level; GLenum target; TRACE("texture %p, sub_resource_idx %u, context %p, format %s, src_box %s, data {%#x:%p}, " @@ -1787,8 +1779,17 @@ static void texture2d_upload_data(struct wined3d_texture *texture, unsigned int update_h /= format->height_scale.denominator; } + target = wined3d_texture_get_sub_resource_target(texture, sub_resource_idx); + level = sub_resource_idx % texture->level_count; + + if (target == GL_TEXTURE_2D_ARRAY) + { + dst_z = sub_resource_idx / texture->level_count; + update_d = 1; + } + bo.buffer_object = data->buffer_object; - bo.addr = (BYTE *)data->addr; + bo.addr = (BYTE *)data->addr + src_box->front * src_slice_pitch; if (texture->resource.format_flags & WINED3DFMT_FLAG_BLOCKS) { bo.addr += (src_box->top / format->block_height) * src_row_pitch; @@ -1814,7 +1815,7 @@ static void texture2d_upload_data(struct wined3d_texture *texture, unsigned int wined3d_format_calculate_pitch(format, 1, update_w, update_h, &dst_row_pitch, &dst_slice_pitch); - if (!(converted_mem = heap_alloc(dst_slice_pitch))) + if (!(converted_mem = heap_calloc(update_d, dst_slice_pitch))) { ERR("Failed to allocate upload buffer.\n"); return; @@ -1823,7 +1824,7 @@ static void texture2d_upload_data(struct wined3d_texture *texture, unsigned int src_mem = context_map_bo_address(context, &bo, src_slice_pitch, GL_PIXEL_UNPACK_BUFFER, WINED3D_MAP_READ); format->upload(src_mem, converted_mem, src_row_pitch, src_slice_pitch, - dst_row_pitch, dst_slice_pitch, update_w, update_h, 1); + dst_row_pitch, dst_slice_pitch, update_w, update_h, update_d); context_unmap_bo_address(context, &bo, GL_PIXEL_UNPACK_BUFFER); bo.buffer_object = 0; @@ -1838,10 +1839,6 @@ static void texture2d_upload_data(struct wined3d_texture *texture, unsigned int checkGLcall("glBindBuffer"); } - target = wined3d_texture_get_sub_resource_target(texture, sub_resource_idx); - level = sub_resource_idx % texture->level_count; - layer = sub_resource_idx / texture->level_count; - if (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED) { unsigned int dst_row_pitch, dst_slice_pitch; @@ -1858,17 +1855,17 @@ static void texture2d_upload_data(struct wined3d_texture *texture, unsigned int wined3d_format_calculate_pitch(format, 1, update_w, update_h, &dst_row_pitch, &dst_slice_pitch); - TRACE("Uploading compressed data, target %#x, level %u, layer %u, x %d, y %d, w %u, h %u, " - "format %#x, image_size %#x, addr %p.\n", - target, level, layer, dst_x, dst_y, - update_w, update_h, internal, dst_slice_pitch, addr); + TRACE("Uploading compressed data, target %#x, level %u, x %u, y %u, z %u, " + "w %u, h %u, d %u, format %#x, image_size %#x, addr %p.\n", + target, level, dst_x, dst_y, dst_z, update_w, update_h, + update_d, internal, dst_slice_pitch, addr); if (dst_row_pitch == src_row_pitch) { - if (target == GL_TEXTURE_2D_ARRAY) + if (target == GL_TEXTURE_2D_ARRAY || target == GL_TEXTURE_3D) { - GL_EXTCALL(glCompressedTexSubImage3D(target, level, dst_x, dst_y, - layer, update_w, update_h, 1, internal, dst_slice_pitch, addr)); + GL_EXTCALL(glCompressedTexSubImage3D(target, level, dst_x, dst_y, dst_z, + update_w, update_h, update_d, internal, dst_slice_pitch * update_d, addr)); } else { @@ -1878,42 +1875,45 @@ static void texture2d_upload_data(struct wined3d_texture *texture, unsigned int } else { - UINT row_count = (update_h + format->block_height - 1) / format->block_height; - UINT row, y; + unsigned int row_count = (update_h + format->block_height - 1) / format->block_height; + unsigned int row, y, z; /* glCompressedTexSubImage2D() ignores pixel store state, so we * can't use the unpack row length like for glTexSubImage2D. */ - for (row = 0, y = dst_y; row < row_count; ++row) + for (z = dst_z; z < dst_z + update_d; ++z) { - if (target == GL_TEXTURE_2D_ARRAY) - { - GL_EXTCALL(glCompressedTexSubImage3D(target, level, dst_x, y, - layer, update_w, format->block_height, 1, internal, dst_row_pitch, addr)); - } - else + for (row = 0, y = dst_y; row < row_count; ++row) { - GL_EXTCALL(glCompressedTexSubImage2D(target, level, dst_x, y, - update_w, format->block_height, internal, dst_row_pitch, addr)); + if (target == GL_TEXTURE_2D_ARRAY || target == GL_TEXTURE_3D) + { + GL_EXTCALL(glCompressedTexSubImage3D(target, level, dst_x, y, z, + update_w, format->block_height, 1, internal, dst_row_pitch, addr)); + } + else + { + GL_EXTCALL(glCompressedTexSubImage2D(target, level, dst_x, y, + update_w, format->block_height, internal, dst_row_pitch, addr)); + } + + y += format->block_height; + addr += src_row_pitch; } - - y += format->block_height; - addr += src_row_pitch; } } checkGLcall("Upload compressed texture data"); } else { - TRACE("Uploading data, target %#x, level %u, layer %u, x %d, y %d, w %u, h %u, " - "format %#x, type %#x, addr %p.\n", - target, level, layer, dst_x, dst_y, - update_w, update_h, format->glFormat, format->glType, bo.addr); + TRACE("Uploading data, target %#x, level %u, x %u, y %u, z %u, " + "w %u, h %u, d %u, format %#x, type %#x, addr %p.\n", + target, level, dst_x, dst_y, dst_z, update_w, update_h, + update_d, format->glFormat, format->glType, bo.addr); gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_ROW_LENGTH, src_row_pitch / format->byte_count); - if (target == GL_TEXTURE_2D_ARRAY) + if (target == GL_TEXTURE_2D_ARRAY || target == GL_TEXTURE_3D) { - GL_EXTCALL(glTexSubImage3D(target, level, dst_x, dst_y, - layer, update_w, update_h, 1, format->glFormat, format->glType, bo.addr)); + GL_EXTCALL(glTexSubImage3D(target, level, dst_x, dst_y, dst_z, + update_w, update_h, update_d, format->glFormat, format->glType, bo.addr)); } else { @@ -1980,7 +1980,6 @@ static BOOL texture2d_load_location(struct wined3d_texture *texture, unsigned in static const struct wined3d_texture_ops texture2d_ops = { - texture2d_upload_data, texture2d_load_location, }; @@ -2570,75 +2569,6 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc return WINED3D_OK; } -/* This call just uploads data, the caller is responsible for binding the - * correct texture. */ -/* Context activation is done by the caller. */ -static void texture3d_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, - struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *src_box, - const struct wined3d_const_bo_address *data, unsigned int row_pitch, unsigned int slice_pitch, - unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, BOOL srgb) -{ - unsigned int level = sub_resource_idx % texture->level_count; - const struct wined3d_gl_info *gl_info = context->gl_info; - unsigned int dst_row_pitch, dst_slice_pitch; - unsigned int update_w, update_h, update_d; - const BYTE *addr = data->addr; - void *converted_mem = NULL; - - TRACE("texture %p, sub_resource_idx %u, context %p, format %s, src_box %s, data {%#x:%p}, " - "row_pitch %#x, slice_pitch %#x, dst_x %u, dst_y %u, dst_z %u, srgb %#x.\n", - texture, sub_resource_idx, context, debug_d3dformat(format->id), debug_box(src_box), - data->buffer_object, data->addr, row_pitch, slice_pitch, dst_x, dst_y, dst_z, srgb); - - addr += src_box->front * slice_pitch; - addr += src_box->top * row_pitch; - addr += src_box->left * format->byte_count; - - update_w = src_box->right - src_box->left; - update_h = src_box->bottom - src_box->top; - update_d = src_box->back - src_box->front; - - if (format->conv_byte_count) - { - if (data->buffer_object) - ERR("Loading a converted texture from a PBO.\n"); - if (texture->resource.format_flags & WINED3DFMT_FLAG_BLOCKS) - ERR("Converting a block-based format.\n"); - - dst_row_pitch = update_w * format->conv_byte_count; - dst_slice_pitch = dst_row_pitch * update_h; - - converted_mem = heap_calloc(update_d, dst_slice_pitch); - format->upload(addr, converted_mem, row_pitch, slice_pitch, - dst_row_pitch, dst_slice_pitch, update_w, update_h, update_d); - addr = converted_mem; - } - else - { - wined3d_texture_get_pitch(texture, sub_resource_idx, &dst_row_pitch, &dst_slice_pitch); - if (row_pitch != dst_row_pitch || slice_pitch != dst_slice_pitch) - FIXME("Ignoring row/slice pitch (%u/%u).\n", row_pitch, slice_pitch); - } - - if (data->buffer_object) - { - GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, data->buffer_object)); - checkGLcall("glBindBuffer"); - } - - GL_EXTCALL(glTexSubImage3D(GL_TEXTURE_3D, level, dst_x, dst_y, dst_z, - update_w, update_h, update_d, format->glFormat, format->glType, addr)); - checkGLcall("glTexSubImage3D"); - - if (data->buffer_object) - { - GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0)); - checkGLcall("glBindBuffer"); - } - - heap_free(converted_mem); -} - /* Context activation is done by the caller. */ static void texture3d_download_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, const struct wined3d_context *context, const struct wined3d_bo_address *data) @@ -2696,7 +2626,7 @@ static void texture3d_srgb_transfer(struct wined3d_texture *texture, unsigned in wined3d_texture_bind_and_dirtify(texture, context, !dest_is_srgb); texture3d_download_data(texture, sub_resource_idx, context, &data); wined3d_texture_bind_and_dirtify(texture, context, dest_is_srgb); - texture3d_upload_data(texture, sub_resource_idx, context, texture->resource.format, + wined3d_texture_upload_data(texture, sub_resource_idx, context, texture->resource.format, &src_box, wined3d_const_bo_address(&data), row_pitch, slice_pitch, 0, 0, 0, FALSE); heap_free(data.addr); @@ -2726,7 +2656,7 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in location == WINED3D_LOCATION_TEXTURE_SRGB); wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); wined3d_texture_get_level_box(texture, sub_resource_idx % texture->level_count, &src_box); - texture3d_upload_data(texture, sub_resource_idx, context, texture->resource.format, + wined3d_texture_upload_data(texture, sub_resource_idx, context, texture->resource.format, &src_box, &data, row_pitch, slice_pitch, 0, 0, 0, FALSE); } else if (sub_resource->locations & WINED3D_LOCATION_BUFFER) @@ -2738,7 +2668,7 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in location == WINED3D_LOCATION_TEXTURE_SRGB); wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); wined3d_texture_get_level_box(texture, sub_resource_idx % texture->level_count, &src_box); - texture3d_upload_data(texture, sub_resource_idx, context, texture->resource.format, + wined3d_texture_upload_data(texture, sub_resource_idx, context, texture->resource.format, &src_box, &data, row_pitch, slice_pitch, 0, 0, 0, FALSE); } else if (sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB) @@ -2809,7 +2739,6 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in static const struct wined3d_texture_ops texture3d_ops = { - texture3d_upload_data, texture3d_load_location, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 678c669b7c3..fdbcd7c3795 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3083,10 +3083,6 @@ struct gl_texture struct wined3d_texture_ops { - void (*texture_upload_data)(struct wined3d_texture *texture, unsigned int sub_resource_idx, - struct wined3d_context *context, const struct wined3d_format *format, - const struct wined3d_box *src_box, const struct wined3d_const_bo_address *data, unsigned int row_pitch, - unsigned int slice_pitch, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, BOOL srgb); BOOL (*texture_load_location)(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location); }; -- 2.11.0

1 0

[PATCH 3/5] wined3d: Handle upload conversion in texture2d_upload_data().
by Henri Verbeet 21 Mar '18

21 Mar '18

For consistency with texture3d_upload_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 35 ++++--------------- dlls/wined3d/texture.c | 77 ++++++++++++++++++++++++++++++++---------- dlls/wined3d/wined3d_private.h | 4 +-- 3 files changed, 67 insertions(+), 49 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8f4e1eebba5..2a725e61e1c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1987,9 +1987,9 @@ BOOL texture2d_load_texture(struct wined3d_texture *texture, unsigned int sub_re struct wined3d_device *device = texture->resource.device; const struct wined3d_color_key_conversion *conversion; struct wined3d_texture_sub_resource *sub_resource; + const struct wined3d_format *format; struct wined3d_bo_address data; BYTE *src_mem, *dst_mem = NULL; - struct wined3d_format format; struct wined3d_box src_box; BOOL depth; @@ -2080,9 +2080,9 @@ BOOL texture2d_load_texture(struct wined3d_texture *texture, unsigned int sub_re wined3d_texture_bind_and_dirtify(texture, context, srgb); wined3d_texture_get_pitch(texture, level, &src_row_pitch, &src_slice_pitch); - format = *texture->resource.format; + format = texture->resource.format; if ((conversion = wined3d_format_get_color_key_conversion(texture, TRUE))) - format = *wined3d_get_format(gl_info, conversion->dst_format, texture->resource.usage); + format = wined3d_get_format(gl_info, conversion->dst_format, texture->resource.usage); /* Don't use PBOs for converted surfaces. During PBO conversion we look at * WINED3D_TEXTURE_CONVERTED but it isn't set (yet) in all cases it is @@ -2096,35 +2096,12 @@ BOOL texture2d_load_texture(struct wined3d_texture *texture, unsigned int sub_re } wined3d_texture_get_memory(texture, sub_resource_idx, &data, sub_resource->locations); - if (format.conv_byte_count) - { - /* This code is entered for texture formats which need a fixup. */ - format.byte_count = format.conv_byte_count; - wined3d_format_calculate_pitch(&format, 1, width, height, &dst_row_pitch, &dst_slice_pitch); - - src_mem = context_map_bo_address(context, &data, src_slice_pitch, - GL_PIXEL_UNPACK_BUFFER, WINED3D_MAP_READ); - if (!(dst_mem = heap_alloc(dst_slice_pitch))) - { - ERR("Out of memory (%u).\n", dst_slice_pitch); - context_release(context); - return FALSE; - } - format.upload(src_mem, dst_mem, src_row_pitch, src_slice_pitch, - dst_row_pitch, dst_slice_pitch, width, height, 1); - src_row_pitch = dst_row_pitch; - src_slice_pitch = dst_slice_pitch; - context_unmap_bo_address(context, &data, GL_PIXEL_UNPACK_BUFFER); - - data.buffer_object = 0; - data.addr = dst_mem; - } - else if (conversion) + if (conversion) { /* This code is only entered for color keying fixups */ struct wined3d_palette *palette = NULL; - wined3d_format_calculate_pitch(&format, device->surface_alignment, + wined3d_format_calculate_pitch(format, device->surface_alignment, width, height, &dst_row_pitch, &dst_slice_pitch); src_mem = context_map_bo_address(context, &data, src_slice_pitch, @@ -2147,7 +2124,7 @@ BOOL texture2d_load_texture(struct wined3d_texture *texture, unsigned int sub_re data.addr = dst_mem; } - wined3d_texture_upload_data(texture, sub_resource_idx, context, &format, &src_box, + wined3d_texture_upload_data(texture, sub_resource_idx, context, format, &src_box, wined3d_const_bo_address(&data), src_row_pitch, src_slice_pitch, 0, 0, 0, srgb); heap_free(dst_mem); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index f5892430956..be40e7135b0 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1745,7 +1745,7 @@ HRESULT CDECL wined3d_texture_add_dirty_region(struct wined3d_texture *texture, } void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, - const struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *src_box, + struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *src_box, const struct wined3d_const_bo_address *data, unsigned int row_pitch, unsigned int slice_pitch, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, BOOL srgb) { @@ -1757,14 +1757,17 @@ void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int s * correct texture. */ /* Context activation is done by the caller. */ static void texture2d_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, - const struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *src_box, + struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *src_box, const struct wined3d_const_bo_address *data, unsigned int src_row_pitch, unsigned int src_slice_pitch, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, BOOL srgb) { const struct wined3d_gl_info *gl_info = context->gl_info; unsigned int update_w = src_box->right - src_box->left; unsigned int update_h = src_box->bottom - src_box->top; + struct wined3d_bo_address bo; + void *converted_mem = NULL; unsigned int level, layer; + struct wined3d_format f; GLenum target; TRACE("texture %p, sub_resource_idx %u, context %p, format %s, src_box %s, data {%#x:%p}, " @@ -1784,9 +1787,54 @@ static void texture2d_upload_data(struct wined3d_texture *texture, unsigned int update_h /= format->height_scale.denominator; } - if (data->buffer_object) + bo.buffer_object = data->buffer_object; + bo.addr = (BYTE *)data->addr; + if (texture->resource.format_flags & WINED3DFMT_FLAG_BLOCKS) { - GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, data->buffer_object)); + bo.addr += (src_box->top / format->block_height) * src_row_pitch; + bo.addr += (src_box->left / format->block_width) * format->block_byte_count; + } + else + { + bo.addr += src_box->top * src_row_pitch; + bo.addr += src_box->left * format->byte_count; + } + + if (format->upload) + { + unsigned int dst_row_pitch, dst_slice_pitch; + void *src_mem; + + if (texture->resource.format_flags & WINED3DFMT_FLAG_BLOCKS) + ERR("Converting a block-based format.\n"); + + f = *format; + f.byte_count = format->conv_byte_count; + format = &f; + + wined3d_format_calculate_pitch(format, 1, update_w, update_h, &dst_row_pitch, &dst_slice_pitch); + + if (!(converted_mem = heap_alloc(dst_slice_pitch))) + { + ERR("Failed to allocate upload buffer.\n"); + return; + } + + src_mem = context_map_bo_address(context, &bo, src_slice_pitch, + GL_PIXEL_UNPACK_BUFFER, WINED3D_MAP_READ); + format->upload(src_mem, converted_mem, src_row_pitch, src_slice_pitch, + dst_row_pitch, dst_slice_pitch, update_w, update_h, 1); + context_unmap_bo_address(context, &bo, GL_PIXEL_UNPACK_BUFFER); + + bo.buffer_object = 0; + bo.addr = converted_mem; + src_row_pitch = dst_row_pitch; + src_slice_pitch = dst_slice_pitch; + } + + if (bo.buffer_object) + { + GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, bo.buffer_object)); checkGLcall("glBindBuffer"); } @@ -1797,12 +1845,9 @@ static void texture2d_upload_data(struct wined3d_texture *texture, unsigned int if (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED) { unsigned int dst_row_pitch, dst_slice_pitch; - const BYTE *addr = data->addr; + const BYTE *addr = bo.addr; GLenum internal; - addr += (src_box->top / format->block_height) * src_row_pitch; - addr += (src_box->left / format->block_width) * format->block_byte_count; - if (srgb) internal = format->glGammaInternal; else if (texture->resource.usage & WINED3DUSAGE_RENDERTARGET @@ -1859,36 +1904,32 @@ static void texture2d_upload_data(struct wined3d_texture *texture, unsigned int } else { - const BYTE *addr = data->addr; - - addr += src_box->top * src_row_pitch; - addr += src_box->left * format->byte_count; - TRACE("Uploading data, target %#x, level %u, layer %u, x %d, y %d, w %u, h %u, " "format %#x, type %#x, addr %p.\n", target, level, layer, dst_x, dst_y, - update_w, update_h, format->glFormat, format->glType, addr); + update_w, update_h, format->glFormat, format->glType, bo.addr); gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_ROW_LENGTH, src_row_pitch / format->byte_count); if (target == GL_TEXTURE_2D_ARRAY) { GL_EXTCALL(glTexSubImage3D(target, level, dst_x, dst_y, - layer, update_w, update_h, 1, format->glFormat, format->glType, addr)); + layer, update_w, update_h, 1, format->glFormat, format->glType, bo.addr)); } else { gl_info->gl_ops.gl.p_glTexSubImage2D(target, level, dst_x, dst_y, - update_w, update_h, format->glFormat, format->glType, addr); + update_w, update_h, format->glFormat, format->glType, bo.addr); } gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_ROW_LENGTH, 0); checkGLcall("Upload texture data"); } - if (data->buffer_object) + if (bo.buffer_object) { GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0)); checkGLcall("glBindBuffer"); } + heap_free(converted_mem); if (wined3d_settings.strict_draw_ordering) gl_info->gl_ops.gl.p_glFlush(); @@ -2533,7 +2574,7 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc * correct texture. */ /* Context activation is done by the caller. */ static void texture3d_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, - const struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *src_box, + struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *src_box, const struct wined3d_const_bo_address *data, unsigned int row_pitch, unsigned int slice_pitch, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, BOOL srgb) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cb2938b6aca..678c669b7c3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3084,7 +3084,7 @@ struct gl_texture struct wined3d_texture_ops { void (*texture_upload_data)(struct wined3d_texture *texture, unsigned int sub_resource_idx, - const struct wined3d_context *context, const struct wined3d_format *format, + struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *src_box, const struct wined3d_const_bo_address *data, unsigned int row_pitch, unsigned int slice_pitch, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, BOOL srgb); BOOL (*texture_load_location)(struct wined3d_texture *texture, unsigned int sub_resource_idx, @@ -3294,7 +3294,7 @@ void wined3d_texture_set_swapchain(struct wined3d_texture *texture, void wined3d_texture_translate_drawable_coords(const struct wined3d_texture *texture, HWND window, RECT *rect) DECLSPEC_HIDDEN; void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, - const struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *src_box, + struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *src_box, const struct wined3d_const_bo_address *data, unsigned int row_pitch, unsigned int slice_pitch, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, BOOL srgb) DECLSPEC_HIDDEN; void wined3d_texture_validate_location(struct wined3d_texture *texture, -- 2.11.0

1 0

← Newer
1
...
25
26
27
28
29
30
31
...
80
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-devel March 2018