March 2020 - Wine-Commits - list.winehq.org

Matteo Bruni : wined3d: Optimize setting shader constants in wined3d_stateblock_capture().
by Alexandre Julliard March 3, 2020

March 3, 2020

Module: wine Branch: master Commit: 7f2aee857088547099e91256e3ff66d7d1d1d17b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f2aee857088547099e91256… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Mar 2 14:02:48 2020 +0100 wined3d: Optimize setting shader constants in wined3d_stateblock_capture(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/stateblock.c | 80 +++++++++++++++++++---------------------------- 1 file changed, 32 insertions(+), 48 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 2c3ff65222..208a1f0606 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -720,9 +720,9 @@ static void wined3d_state_record_lights(struct wined3d_light_state *dst_state, void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock, const struct wined3d_stateblock *device_state) { - const unsigned int word_bit_count = sizeof(*stateblock->changed.vs_consts_f) * CHAR_BIT; const struct wined3d_stateblock_state *state = &device_state->stateblock_state; - unsigned int i, j, idx; + struct wined3d_range range; + unsigned int i, start; DWORD map; TRACE("stateblock %p, device_state %p.\n", stateblock, device_state); @@ -738,74 +738,58 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock, stateblock->stateblock_state.vs = state->vs; } - for (i = 0; i < ARRAY_SIZE(stateblock->changed.vs_consts_f); ++i) + for (start = 0; ; start = range.offset + range.size) { - map = stateblock->changed.vs_consts_f[i]; - - while (map) - { - j = wined3d_bit_scan(&map); - idx = i * word_bit_count + j; + if (!wined3d_bitmap_get_range(stateblock->changed.vs_consts_f, WINED3D_MAX_VS_CONSTS_F, start, &range)) + break; - TRACE("Setting vs_consts_f[%u] to %s.\n", idx, debug_vec4(&state->vs_consts_f[idx])); - stateblock->stateblock_state.vs_consts_f[idx] = state->vs_consts_f[idx]; - } + memcpy(&stateblock->stateblock_state.vs_consts_f[range.offset], &state->vs_consts_f[range.offset], + sizeof(*state->vs_consts_f) * range.size); } - map = stateblock->changed.vertexShaderConstantsI; - while (map) + for (start = 0; ; start = range.offset + range.size) { - idx = wined3d_bit_scan(&map); - - TRACE("Setting vs_consts_i[%u] to %s.\n", idx, debug_ivec4(&state->vs_consts_i[idx])); + if (!wined3d_bitmap_get_range(&map, WINED3D_MAX_CONSTS_I, start, &range)) + break; - stateblock->stateblock_state.vs_consts_i[idx] = state->vs_consts_i[idx]; + memcpy(&stateblock->stateblock_state.vs_consts_i[range.offset], &state->vs_consts_i[range.offset], + sizeof(*state->vs_consts_i) * range.size); } - map = stateblock->changed.vertexShaderConstantsB; - while (map) + for (start = 0; ; start = range.offset + range.size) { - idx = wined3d_bit_scan(&map); - - TRACE("Setting vs_consts_b[%u] to %s.\n", - idx, state->vs_consts_b[idx] ? "TRUE" : "FALSE"); + if (!wined3d_bitmap_get_range(&map, WINED3D_MAX_CONSTS_B, start, &range)) + break; - stateblock->stateblock_state.vs_consts_b[idx] = state->vs_consts_b[idx]; + memcpy(&stateblock->stateblock_state.vs_consts_b[range.offset], &state->vs_consts_b[range.offset], + sizeof(*state->vs_consts_b) * range.size); } - for (i = 0; i < ARRAY_SIZE(stateblock->changed.ps_consts_f); ++i) + for (start = 0; ; start = range.offset + range.size) { - map = stateblock->changed.ps_consts_f[i]; - - while (map) - { - j = wined3d_bit_scan(&map); - idx = i * word_bit_count + j; + if (!wined3d_bitmap_get_range(stateblock->changed.ps_consts_f, WINED3D_MAX_PS_CONSTS_F, start, &range)) + break; - TRACE("Setting ps_consts_f[%u] to %s.\n", idx, debug_vec4(&state->ps_consts_f[idx])); - stateblock->stateblock_state.ps_consts_f[idx] = state->ps_consts_f[idx]; - } + memcpy(&stateblock->stateblock_state.ps_consts_f[range.offset], &state->ps_consts_f[range.offset], + sizeof(*state->ps_consts_f) * range.size); } - map = stateblock->changed.pixelShaderConstantsI; - while (map) + for (start = 0; ; start = range.offset + range.size) { - idx = wined3d_bit_scan(&map); - - TRACE("Setting ps_consts_i[%u] to %s.\n", idx, debug_ivec4(&state->ps_consts_i[idx])); + if (!wined3d_bitmap_get_range(&map, WINED3D_MAX_CONSTS_I, start, &range)) + break; - stateblock->stateblock_state.ps_consts_i[idx] = state->ps_consts_i[idx]; + memcpy(&stateblock->stateblock_state.ps_consts_i[range.offset], &state->ps_consts_i[range.offset], + sizeof(*state->ps_consts_i) * range.size); } - map = stateblock->changed.pixelShaderConstantsB; - while (map) + for (start = 0; ; start = range.offset + range.size) { - idx = wined3d_bit_scan(&map); - - TRACE("Setting ps_consts_b[%u] to %s.\n", - idx, state->ps_consts_b[idx] ? "TRUE" : "FALSE"); + if (!wined3d_bitmap_get_range(&map, WINED3D_MAX_CONSTS_B, start, &range)) + break; - stateblock->stateblock_state.ps_consts_b[idx] = state->ps_consts_b[idx]; + memcpy(&stateblock->stateblock_state.ps_consts_b[range.offset], &state->ps_consts_b[range.offset], + sizeof(*state->ps_consts_b) * range.size); } if (stateblock->changed.transforms)

1 0

Matteo Bruni : wined3d: Introduce a global stateblock flag for transforms.
by Alexandre Julliard March 3, 2020

March 3, 2020

Module: wine Branch: master Commit: a8c44bd94c9e4ff7cbbe07eed071f4413227f31e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8c44bd94c9e4ff7cbbe07ee… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Mar 2 14:02:46 2020 +0100 wined3d: Introduce a global stateblock flag for transforms. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 15 +++++++++------ dlls/wined3d/stateblock.c | 26 ++++++++++++++++---------- dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 27 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 639e94a624..99fbf21ada 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3977,14 +3977,17 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, } } - for (i = 0; i < ARRAY_SIZE(changed->transform); ++i) + if (changed->transforms) { - map = changed->transform[i]; - while (map) + for (i = 0; i < ARRAY_SIZE(changed->transform); ++i) { - j = wined3d_bit_scan(&map); - idx = i * word_bit_count + j; - wined3d_device_set_transform(device, idx, &state->transforms[idx]); + map = changed->transform[i]; + while (map) + { + j = wined3d_bit_scan(&map); + idx = i * word_bit_count + j; + wined3d_device_set_transform(device, idx, &state->transforms[idx]); + } } } diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index c47a7323b1..6e3a473782 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -210,6 +210,7 @@ static void stateblock_savedstates_set_all(struct wined3d_saved_states *states, states->scissorRect = 1; states->blend_state = 1; states->lights = 1; + states->transforms = 1; states->streamSource = 0xffff; states->streamFreq = 0xffff; @@ -807,14 +808,16 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock, stateblock->stateblock_state.ps_consts_b[idx] = state->ps_consts_b[idx]; } - /* Others + Render & Texture */ - for (i = 0; i < stateblock->num_contained_transform_states; ++i) + if (stateblock->changed.transforms) { - enum wined3d_transform_state transform = stateblock->contained_transform_states[i]; + for (i = 0; i < stateblock->num_contained_transform_states; ++i) + { + enum wined3d_transform_state transform = stateblock->contained_transform_states[i]; - TRACE("Updating transform %#x.\n", transform); + TRACE("Updating transform %#x.\n", transform); - stateblock->stateblock_state.transforms[transform] = state->transforms[transform]; + stateblock->stateblock_state.transforms[transform] = state->transforms[transform]; + } } if (stateblock->changed.indices @@ -1177,13 +1180,15 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock, wined3d_device_set_sampler_state(device, stage, sampler_state, value); } - /* Transform states. */ - for (i = 0; i < stateblock->num_contained_transform_states; ++i) + if (stateblock->changed.transforms) { - enum wined3d_transform_state transform = stateblock->contained_transform_states[i]; + for (i = 0; i < stateblock->num_contained_transform_states; ++i) + { + enum wined3d_transform_state transform = stateblock->contained_transform_states[i]; - state->transforms[transform] = stateblock->stateblock_state.transforms[transform]; - wined3d_device_set_transform(device, transform, &stateblock->stateblock_state.transforms[transform]); + state->transforms[transform] = stateblock->stateblock_state.transforms[transform]; + wined3d_device_set_transform(device, transform, &stateblock->stateblock_state.transforms[transform]); + } } if (stateblock->changed.indices) @@ -1579,6 +1584,7 @@ void CDECL wined3d_stateblock_set_transform(struct wined3d_stateblock *statebloc stateblock->stateblock_state.transforms[d3dts] = *matrix; stateblock->changed.transform[d3dts >> 5] |= 1u << (d3dts & 0x1f); + stateblock->changed.transforms = 1; } void CDECL wined3d_stateblock_multiply_transform(struct wined3d_stateblock *stateblock, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c658f5104c..f266d2a690 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3938,7 +3938,8 @@ struct wined3d_saved_states DWORD store_stream_offset : 1; DWORD blend_state : 1; DWORD lights : 1; - DWORD padding : 2; + DWORD transforms : 1; + DWORD padding : 1; }; struct StageState {

1 0

Jacek Caban : winegcc: Lookup PATH in find_binary and don't try to run binaries that can't be found.
by Alexandre Julliard March 3, 2020

March 3, 2020

Module: wine Branch: master Commit: 945c61c32d86fa7b3bac0641840f26897e55f1ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=945c61c32d86fa7b3bac0641… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 3 14:01:59 2020 +0100 winegcc: Lookup PATH in find_binary and don't try to run binaries that can't be found. Based on winebuild. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/utils.c | 44 ++++++++++++++++++++++++++++++++++++++------ tools/winegcc/winegcc.c | 7 ++++++- 2 files changed, 44 insertions(+), 7 deletions(-) diff --git a/tools/winegcc/utils.c b/tools/winegcc/utils.c index 52f46c491b..1a9bc0a63c 100644 --- a/tools/winegcc/utils.c +++ b/tools/winegcc/utils.c @@ -34,6 +34,12 @@ # define min(x,y) (((x) < (y)) ? (x) : (y)) #endif +#if defined(_WIN32) && !defined(__CYGWIN__) +# define PATH_SEPARATOR ';' +#else +# define PATH_SEPARATOR ':' +#endif + int verbose = 0; void error(const char* s, ...) @@ -305,18 +311,44 @@ file_type get_lib_type(enum target_platform platform, strarray* path, const char const char *find_binary( const strarray* prefix, const char *name ) { + char *file_name, *args; + static strarray *path; unsigned int i; - if (!prefix) return name; if (strchr( name, '/' )) return name; - for (i = 0; i < prefix->size; i++) + file_name = xstrdup( name ); + if ((args = strchr( file_name, ' ' ))) *args++ = 0; + + if (prefix) + { + for (i = 0; i < prefix->size; i++) + { + struct stat st; + char *prog = strmake( "%s/%s%s", prefix->base[i], file_name, EXEEXT ); + if (stat( prog, &st ) == 0 && S_ISREG( st.st_mode ) && (st.st_mode & 0111)) + return args ? strmake( "%s %s", prog, args ) : prog; + free( prog ); + } + } + if (!path) { - struct stat st; - char *prog = strmake( "%s/%s%s", prefix->base[i], name, EXEEXT ); - if (stat( prog, &st ) == 0 && S_ISREG( st.st_mode ) && (st.st_mode & 0111)) return prog; + path = strarray_alloc(); + + /* then append the PATH directories */ + if (getenv( "PATH" )) + { + char *p = xstrdup( getenv( "PATH" )); + while (*p) + { + strarray_add( path, p ); + while (*p && *p != PATH_SEPARATOR) p++; + if (!*p) break; + *p++ = 0; + } + } } - return name; + return prefix == path ? NULL : find_binary( path, name ); } int spawn(const strarray* prefix, const strarray* args, int ignore_errors) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 20c72ec3c5..f2802e2460 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -316,6 +316,7 @@ static char* get_temp_file(const char* prefix, const char* suffix) static const char* build_tool_name(struct options *opts, const char* base, const char* deflt) { + const char *path; char* str; if (opts->target && opts->version) @@ -332,7 +333,10 @@ static const char* build_tool_name(struct options *opts, const char* base, const } else str = xstrdup(deflt); - return find_binary( opts->prefix, str ); + + if ((path = find_binary( opts->prefix, str ))) return path; + error( "Could not find %s\n", base ); + return NULL; } static strarray* get_translator(struct options *opts) @@ -877,6 +881,7 @@ static strarray *get_winebuild_args(struct options *opts) binary = strmake( "%s/winebuild%s", bindir, EXEEXT ); else binary = find_binary( opts->prefix, "winebuild" ); + if (!binary) error( "Could not find winebuild\n" ); strarray_add( spec_args, binary ); if (verbose) strarray_add( spec_args, "-v" ); if (keep_generated) strarray_add( spec_args, "--save-temps" );

1 0

Zebediah Figura : ddraw: Retrieve the material from the primary stateblock.
by Alexandre Julliard March 3, 2020

March 3, 2020

Module: wine Branch: master Commit: 955512d2087f22c9e792364f5d5bfd7384655fc3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=955512d2087f22c9e792364f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Feb 28 14:18:41 2020 -0600 ddraw: Retrieve the material from the primary stateblock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 7acc8e0db0..fa79a98777 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -5495,7 +5495,7 @@ static HRESULT d3d_device7_GetMaterial(IDirect3DDevice7 *iface, D3DMATERIAL7 *ma wined3d_mutex_lock(); /* Note: D3DMATERIAL7 is compatible with struct wined3d_material. */ - wined3d_device_get_material(device->wined3d_device, (struct wined3d_material *)material); + memcpy(material, &wined3d_stateblock_get_state(device->state)->material, sizeof(*material)); wined3d_mutex_unlock(); return D3D_OK;

1 0

Jacek Caban : winegcc: Add support for using clang directly.
by Alexandre Julliard March 3, 2020

March 3, 2020

Module: wine Branch: master Commit: aabfd2dd3abc8b6cf1c42ce0adbd5b6dca6d5db0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aabfd2dd3abc8b6cf1c42ce0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 3 14:02:28 2020 +0100 winegcc: Add support for using clang directly. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 35 +++++++++++++++++++++++++++++------ 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index f2329e492c..d663103186 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -325,20 +325,23 @@ enum tool static const struct { const char *base; + const char *llvm_base; const char *deflt; } tool_names[] = { - { "gcc", CC }, - { "g++", CXX }, - { "cpp", CPP }, - { "ld", LD }, + { "gcc", "clang --driver-mode=gcc", CC }, + { "g++", "clang --driver-mode=g++", CXX }, + { "cpp", "clang --driver-mode=cpp", CPP }, + { "ld", "ld.lld", LD }, }; static strarray* build_tool_name( struct options *opts, enum tool tool ) { const char *base = tool_names[tool].base; + const char *llvm_base = tool_names[tool].llvm_base; const char *deflt = tool_names[tool].deflt; const char *path; + strarray *ret; char* str; if (opts->target && opts->version) @@ -357,8 +360,28 @@ static strarray* build_tool_name( struct options *opts, enum tool tool ) str = xstrdup(deflt); if ((path = find_binary( opts->prefix, str ))) return strarray_fromstring( path, " " ); - error( "Could not find %s\n", base ); - return NULL; + + if (!opts->version) str = xstrdup( llvm_base ); + else str = strmake( "%s-%s", llvm_base, opts->version ); + path = find_binary( opts->prefix, str ); + if (!path) + { + error( "Could not find %s\n", base ); + return NULL; + } + + ret = strarray_fromstring( path, " " ); + if (!strncmp( llvm_base, "clang", 5 )) + { + if (opts->target) + { + strarray_add( ret, "-target" ); + strarray_add( ret, opts->target ); + } + strarray_add( ret, "-Wno-unused-command-line-argument" ); + strarray_add( ret, "-fuse-ld=lld" ); + } + return ret; } static strarray* get_translator(struct options *opts)

1 0

Jacek Caban : winegcc: Return build_tool_name result as strarray.
by Alexandre Julliard March 3, 2020

March 3, 2020

Module: wine Branch: master Commit: 4cfe747772e0ac9d1c35caab5c3d989dc4cb1868 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4cfe747772e0ac9d1c35caab… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 3 14:02:08 2020 +0100 winegcc: Return build_tool_name result as strarray. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index f2802e2460..6bcd157a26 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -314,7 +314,7 @@ static char* get_temp_file(const char* prefix, const char* suffix) return tmp; } -static const char* build_tool_name(struct options *opts, const char* base, const char* deflt) +static strarray* build_tool_name(struct options *opts, const char* base, const char* deflt) { const char *path; char* str; @@ -334,31 +334,31 @@ static const char* build_tool_name(struct options *opts, const char* base, const else str = xstrdup(deflt); - if ((path = find_binary( opts->prefix, str ))) return path; + if ((path = find_binary( opts->prefix, str ))) return strarray_fromstring( path, " " ); error( "Could not find %s\n", base ); return NULL; } static strarray* get_translator(struct options *opts) { - const char *str = NULL; + strarray *tool; switch(opts->processor) { case proc_cpp: - str = build_tool_name(opts, "cpp", CPP); + tool = build_tool_name(opts, "cpp", CPP); break; case proc_cc: case proc_as: - str = build_tool_name(opts, "gcc", CC); + tool = build_tool_name(opts, "gcc", CC); break; case proc_cxx: - str = build_tool_name(opts, "g++", CXX); + tool = build_tool_name(opts, "g++", CXX); break; default: assert(0); } - return strarray_fromstring( str, " " ); + return tool; } static int try_link( const strarray *prefix, const strarray *link_tool, const char *cflags ) @@ -680,8 +680,8 @@ static void compile(struct options* opts, const char* lang) /* mixing different C and C++ compilers isn't supported in configure anyway */ case proc_cc: case proc_cxx: - gcc = strarray_fromstring(build_tool_name(opts, "gcc", CC), " "); - gpp = strarray_fromstring(build_tool_name(opts, "g++", CXX), " "); + gcc = build_tool_name(opts, "gcc", CC); + gpp = build_tool_name(opts, "g++", CXX); for ( j = 0; !gcc_defs && j < comp_args->size; j++ ) { const char *cc = comp_args->base[j]; @@ -993,7 +993,7 @@ static void add_library( struct options *opts, strarray *lib_dirs, strarray *fil static void build(struct options* opts) { strarray *lib_dirs, *files; - strarray *spec_args, *link_args; + strarray *spec_args, *link_args, *tool; char *output_file, *output_path; const char *spec_o_name, *libgcc = NULL; const char *output_name, *spec_file, *lang; @@ -1161,8 +1161,8 @@ static void build(struct options* opts) /* run winebuild to generate the .spec.o file */ spec_args = get_winebuild_args( opts ); - strarray_add( spec_args, strmake( "--cc-cmd=%s", build_tool_name( opts, "gcc", CC ))); - if (!is_pe) strarray_add( spec_args, strmake( "--ld-cmd=%s", build_tool_name( opts, "ld", LD ))); + if ((tool = build_tool_name( opts, "gcc", CC ))) strarray_add( spec_args, strmake( "--cc-cmd=%s", strarray_tostring( tool, " " ))); + if (!is_pe && (tool = build_tool_name( opts, "ld", LD ))) strarray_add( spec_args, strmake( "--ld-cmd=%s", strarray_tostring( tool, " " ))); spec_o_name = get_temp_file(output_name, ".spec.o"); if (opts->force_pointer_size)

1 0

Matteo Bruni : wined3d: Optimize setting shader constants in wined3d_stateblock_apply().
by Alexandre Julliard March 3, 2020

March 3, 2020

Module: wine Branch: master Commit: ac142679eec0322681839a4eecd4b2371cb792eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac142679eec0322681839a4e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Mar 2 14:02:47 2020 +0100 wined3d: Optimize setting shader constants in wined3d_stateblock_apply(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/stateblock.c | 82 +++++++++++++++++++++++++---------------------- 1 file changed, 44 insertions(+), 38 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 6e3a473782..2c3ff65222 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1005,12 +1005,12 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock, void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock, struct wined3d_stateblock *device_state) { - const unsigned int word_bit_count = sizeof(*stateblock->changed.vs_consts_f) * CHAR_BIT; struct wined3d_stateblock_state *state = &device_state->stateblock_state; struct wined3d_device *device = stateblock->device; struct wined3d_blend_state *blend_state; struct wined3d_color colour; - unsigned int i, j, idx; + struct wined3d_range range; + unsigned int i, start; BOOL set_blend_state; DWORD map; @@ -1026,34 +1026,37 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock, wined3d_device_set_vertex_shader(device, stateblock->stateblock_state.vs); } - for (i = 0; i < ARRAY_SIZE(stateblock->changed.vs_consts_f); ++i) + for (start = 0; ; start = range.offset + range.size) { - map = stateblock->changed.vs_consts_f[i]; - - while (map) - { - j = wined3d_bit_scan(&map); - idx = i * word_bit_count + j; + if (!wined3d_bitmap_get_range(stateblock->changed.vs_consts_f, WINED3D_MAX_VS_CONSTS_F, start, &range)) + break; - state->vs_consts_f[idx] = stateblock->stateblock_state.vs_consts_f[idx]; - wined3d_device_set_vs_consts_f(device, idx, 1, &stateblock->stateblock_state.vs_consts_f[idx]); - } + memcpy(&state->vs_consts_f[range.offset], &stateblock->stateblock_state.vs_consts_f[range.offset], + sizeof(*state->vs_consts_f) * range.size); + wined3d_device_set_vs_consts_f(device, range.offset, range.size, + &stateblock->stateblock_state.vs_consts_f[range.offset]); } map = stateblock->changed.vertexShaderConstantsI; - while (map) + for (start = 0; ; start = range.offset + range.size) { - idx = wined3d_bit_scan(&map); + if (!wined3d_bitmap_get_range(&map, WINED3D_MAX_CONSTS_I, start, &range)) + break; - state->vs_consts_i[idx] = stateblock->stateblock_state.vs_consts_i[idx]; - wined3d_device_set_vs_consts_i(device, idx, 1, &stateblock->stateblock_state.vs_consts_i[idx]); + memcpy(&state->vs_consts_i[range.offset], &stateblock->stateblock_state.vs_consts_i[range.offset], + sizeof(*state->vs_consts_i) * range.size); + wined3d_device_set_vs_consts_i(device, range.offset, range.size, + &stateblock->stateblock_state.vs_consts_i[range.offset]); } map = stateblock->changed.vertexShaderConstantsB; - while (map) + for (start = 0; ; start = range.offset + range.size) { - idx = wined3d_bit_scan(&map); + if (!wined3d_bitmap_get_range(&map, WINED3D_MAX_CONSTS_B, start, &range)) + break; - state->vs_consts_b[idx] = stateblock->stateblock_state.vs_consts_b[idx]; - wined3d_device_set_vs_consts_b(device, idx, 1, &stateblock->stateblock_state.vs_consts_b[idx]); + memcpy(&state->vs_consts_b[range.offset], &stateblock->stateblock_state.vs_consts_b[range.offset], + sizeof(*state->vs_consts_b) * range.size); + wined3d_device_set_vs_consts_b(device, range.offset, range.size, + &stateblock->stateblock_state.vs_consts_b[range.offset]); } if (stateblock->changed.lights) @@ -1086,34 +1089,37 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock, wined3d_device_set_pixel_shader(device, stateblock->stateblock_state.ps); } - for (i = 0; i < ARRAY_SIZE(stateblock->changed.ps_consts_f); ++i) + for (start = 0; ; start = range.offset + range.size) { - map = stateblock->changed.ps_consts_f[i]; - - while (map) - { - j = wined3d_bit_scan(&map); - idx = i * word_bit_count + j; + if (!wined3d_bitmap_get_range(stateblock->changed.ps_consts_f, WINED3D_MAX_PS_CONSTS_F, start, &range)) + break; - state->ps_consts_f[idx] = stateblock->stateblock_state.ps_consts_f[idx]; - wined3d_device_set_ps_consts_f(device, idx, 1, &stateblock->stateblock_state.ps_consts_f[idx]); - } + memcpy(&state->ps_consts_f[range.offset], &stateblock->stateblock_state.ps_consts_f[range.offset], + sizeof(*state->ps_consts_f) * range.size); + wined3d_device_set_ps_consts_f(device, range.offset, range.size, + &stateblock->stateblock_state.ps_consts_f[range.offset]); } map = stateblock->changed.pixelShaderConstantsI; - while (map) + for (start = 0; ; start = range.offset + range.size) { - idx = wined3d_bit_scan(&map); + if (!wined3d_bitmap_get_range(&map, WINED3D_MAX_CONSTS_I, start, &range)) + break; - state->ps_consts_i[idx] = stateblock->stateblock_state.ps_consts_i[idx]; - wined3d_device_set_ps_consts_i(device, idx, 1, &stateblock->stateblock_state.ps_consts_i[idx]); + memcpy(&state->ps_consts_i[range.offset], &stateblock->stateblock_state.ps_consts_i[range.offset], + sizeof(*state->ps_consts_i) * range.size); + wined3d_device_set_ps_consts_i(device, range.offset, range.size, + &stateblock->stateblock_state.ps_consts_i[range.offset]); } map = stateblock->changed.pixelShaderConstantsB; - while (map) + for (start = 0; ; start = range.offset + range.size) { - idx = wined3d_bit_scan(&map); + if (!wined3d_bitmap_get_range(&map, WINED3D_MAX_CONSTS_B, start, &range)) + break; - state->ps_consts_b[idx] = stateblock->stateblock_state.ps_consts_b[idx]; - wined3d_device_set_ps_consts_b(device, idx, 1, &stateblock->stateblock_state.ps_consts_b[idx]); + memcpy(&state->ps_consts_b[range.offset], &stateblock->stateblock_state.ps_consts_b[range.offset], + sizeof(*state->ps_consts_b) * range.size); + wined3d_device_set_ps_consts_b(device, range.offset, range.size, + &stateblock->stateblock_state.ps_consts_b[range.offset]); } if ((set_blend_state = stateblock->changed.blend_state

1 0

Matteo Bruni : wined3d: Introduce a stateblock flag for lights.
by Alexandre Julliard March 3, 2020

March 3, 2020

Module: wine Branch: master Commit: 0d2a1eccedac5b615fbf1b28ae86ed36eab930a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d2a1eccedac5b615fbf1b28… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Mar 2 14:02:45 2020 +0100 wined3d: Introduce a stateblock flag for lights. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 15 +++++++++------ dlls/wined3d/stateblock.c | 31 ++++++++++++++++++++----------- dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 31 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 660ba777ef..639e94a624 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3904,14 +3904,17 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, wined3d_device_set_ps_consts_b(device, range.offset, range.size, &state->ps_consts_b[range.offset]); } - for (i = 0; i < ARRAY_SIZE(state->light_state->light_map); ++i) + if (changed->lights) { - const struct wined3d_light_info *light; - - LIST_FOR_EACH_ENTRY(light, &state->light_state->light_map[i], struct wined3d_light_info, entry) + for (i = 0; i < ARRAY_SIZE(state->light_state->light_map); ++i) { - wined3d_device_set_light(device, light->OriginalIndex, &light->OriginalParms); - wined3d_device_set_light_enable(device, light->OriginalIndex, light->glIndex != -1); + const struct wined3d_light_info *light; + + LIST_FOR_EACH_ENTRY(light, &state->light_state->light_map[i], struct wined3d_light_info, entry) + { + wined3d_device_set_light(device, light->OriginalIndex, &light->OriginalParms); + wined3d_device_set_light_enable(device, light->OriginalIndex, light->glIndex != -1); + } } } diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 69210e1fba..c47a7323b1 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -209,6 +209,7 @@ static void stateblock_savedstates_set_all(struct wined3d_saved_states *states, states->vertexShader = 1; states->scissorRect = 1; states->blend_state = 1; + states->lights = 1; states->streamSource = 0xffff; states->streamFreq = 0xffff; @@ -262,6 +263,7 @@ static void stateblock_savedstates_set_vertex(struct wined3d_saved_states *state states->vertexDecl = 1; states->vertexShader = 1; states->blend_state = 1; + states->lights = 1; for (i = 0; i < ARRAY_SIZE(vertex_states_render); ++i) { @@ -982,7 +984,8 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock, stateblock->stateblock_state.ps = state->ps; } - wined3d_state_record_lights(stateblock->stateblock_state.light_state, state->light_state); + if (stateblock->changed.lights) + wined3d_state_record_lights(stateblock->stateblock_state.light_state, state->light_state); if (stateblock->changed.blend_state && stateblock->stateblock_state.blend_state != state->blend_state) { @@ -1050,20 +1053,23 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock, wined3d_device_set_vs_consts_b(device, idx, 1, &stateblock->stateblock_state.vs_consts_b[idx]); } - for (i = 0; i < ARRAY_SIZE(stateblock->stateblock_state.light_state->light_map); ++i) + if (stateblock->changed.lights) { - const struct wined3d_light_info *light; - struct wined3d_light_info *new_light; - - LIST_FOR_EACH_ENTRY(light, &stateblock->stateblock_state.light_state->light_map[i], struct wined3d_light_info, entry) + for (i = 0; i < ARRAY_SIZE(stateblock->stateblock_state.light_state->light_map); ++i) { - if (SUCCEEDED(wined3d_light_state_set_light(state->light_state, light->OriginalIndex, - &light->OriginalParms, &new_light))) + const struct wined3d_light_info *light; + struct wined3d_light_info *new_light; + + LIST_FOR_EACH_ENTRY(light, &stateblock->stateblock_state.light_state->light_map[i], struct wined3d_light_info, entry) { - wined3d_light_state_enable_light(state->light_state, &device->adapter->d3d_info, new_light, light->glIndex != -1); + if (SUCCEEDED(wined3d_light_state_set_light(state->light_state, light->OriginalIndex, + &light->OriginalParms, &new_light))) + { + wined3d_light_state_enable_light(state->light_state, &device->adapter->d3d_info, new_light, light->glIndex != -1); + } + wined3d_device_set_light(device, light->OriginalIndex, &light->OriginalParms); + wined3d_device_set_light_enable(device, light->OriginalIndex, light->glIndex != -1); } - wined3d_device_set_light(device, light->OriginalIndex, &light->OriginalParms); - wined3d_device_set_light_enable(device, light->OriginalIndex, light->glIndex != -1); } } @@ -1708,6 +1714,7 @@ HRESULT CDECL wined3d_stateblock_set_stream_source_freq(struct wined3d_statebloc stateblock->changed.streamFreq |= 1u << stream_idx; return WINED3D_OK; } + HRESULT CDECL wined3d_stateblock_set_light(struct wined3d_stateblock *stateblock, UINT light_idx, const struct wined3d_light *light) { @@ -1744,6 +1751,7 @@ HRESULT CDECL wined3d_stateblock_set_light(struct wined3d_stateblock *stateblock return WINED3DERR_INVALIDCALL; } + stateblock->changed.lights = 1; return wined3d_light_state_set_light(stateblock->stateblock_state.light_state, light_idx, light, &object); } @@ -1761,6 +1769,7 @@ HRESULT CDECL wined3d_stateblock_set_light_enable(struct wined3d_stateblock *sta return hr; } wined3d_light_state_enable_light(light_state, &stateblock->device->adapter->d3d_info, light_info, enable); + stateblock->changed.lights = 1; return S_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 744e647008..c658f5104c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3937,7 +3937,8 @@ struct wined3d_saved_states DWORD scissorRect : 1; DWORD store_stream_offset : 1; DWORD blend_state : 1; - DWORD padding : 3; + DWORD lights : 1; + DWORD padding : 2; }; struct StageState {

1 0

Francois Gouget : kernel32/tests: Fix test_Toolhelp()'s nested process lookup.
by Alexandre Julliard March 3, 2020

March 3, 2020

Module: wine Branch: master Commit: e4c15b5bbd567694dbcdb142751e7410e323c691 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4c15b5bbd567694dbcdb142… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 2 18:27:30 2020 +0100 kernel32/tests: Fix test_Toolhelp()'s nested process lookup. On Windows, processes are not reassigned to pid 1 when their parent dies. This means many processes could have the same ppid despite being started by unrelated processes. It also means test_Toolhelp() cannot reliably look up the nested process by its ppid. So look up for the nested process by its pid and only then check its ppid, executable file, etc. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48664 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index b32560358d..b5ed99062e 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -1157,6 +1157,7 @@ static void test_Toolhelp(void) STARTUPINFOA startup; PROCESS_INFORMATION info; HANDLE process, thread, snapshot; + DWORD nested_pid; PROCESSENTRY32 pe; THREADENTRY32 te; DWORD ret; @@ -1209,17 +1210,24 @@ static void test_Toolhelp(void) /* The following test fails randomly on some Windows versions, but Gothic 2 depends on it */ ok(i < 20 || broken(i == 20), "process object not released\n"); + /* Look for the nested process by pid */ + WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + nested_pid = GetPrivateProfileIntA("Nested", "Pid", 0, resfile); + DeleteFileA(resfile); + snapshot = pCreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0); ok(snapshot != INVALID_HANDLE_VALUE, "CreateToolhelp32Snapshot failed %u\n", GetLastError()); memset(&pe, 0, sizeof(pe)); pe.dwSize = sizeof(pe); if (pProcess32First(snapshot, &pe)) { - while (pe.th32ParentProcessID != info.dwProcessId) + while (pe.th32ProcessID != nested_pid) if (!pProcess32Next(snapshot, &pe)) break; } CloseHandle(snapshot); - ok(pe.th32ParentProcessID == info.dwProcessId, "failed to find nested child process\n"); + ok(pe.th32ProcessID == nested_pid, "failed to find nested child process\n"); + ok(pe.th32ParentProcessID == info.dwProcessId, "nested child process has parent %u instead of %u\n", pe.th32ParentProcessID, info.dwProcessId); + ok(stricmp(pe.szExeFile, exename) == 0, "nested executable is %s instead of %s\n", pe.szExeFile, exename); process = OpenProcess(PROCESS_ALL_ACCESS_NT4, FALSE, pe.th32ProcessID); ok(process != NULL, "OpenProcess failed %u\n", GetLastError()); @@ -1242,7 +1250,8 @@ static void test_Toolhelp(void) ok(ret == 1, "expected 1, got %u\n", ret); CloseHandle(thread); - ok(WaitForSingleObject(process, 30000) == WAIT_OBJECT_0, "Child process termination\n"); + ret = WaitForSingleObject(process, 30000); + ok(ret == WAIT_OBJECT_0, "Child process termination got %u le=%u\n", ret, GetLastError()); CloseHandle(process); WritePrivateProfileStringA(NULL, NULL, NULL, resfile); @@ -4048,6 +4057,7 @@ START_TEST(process) char buffer[MAX_PATH + 26]; STARTUPINFOA startup; PROCESS_INFORMATION info; + HANDLE hFile; memset(&startup, 0, sizeof(startup)); startup.cb = sizeof(startup); @@ -4058,6 +4068,14 @@ START_TEST(process) ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, CREATE_SUSPENDED, NULL, NULL, &startup, &info), "CreateProcess failed\n"); CloseHandle(info.hProcess); CloseHandle(info.hThread); + + /* The nested process is suspended so we can use the same resource + * file and it's up to the parent to read it before resuming the + * nested process. + */ + hFile = CreateFileA(myARGV[3], GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + childPrintf(hFile, "[Nested]\nPid=%08u\n", info.dwProcessId); + CloseHandle(hFile); return; } else if (!strcmp(myARGV[2], "parent") && myARGC >= 5)

1 0

Zebediah Figura : d3dcompiler/tests: Add some more tests for return statements.
by Alexandre Julliard March 3, 2020

March 3, 2020

Module: wine Branch: master Commit: 8b08fec5e35e59a5fc4c7c0a904f61b208970125 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b08fec5e35e59a5fc4c7c0a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 1 22:55:23 2020 -0600 d3dcompiler/tests: Add some more tests for return statements. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 68 ++++++++++++++++++++++++++++++++++- 1 file changed, 67 insertions(+), 1 deletion(-) diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c index 9bf3784c1d..062ef0a84a 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c @@ -604,6 +604,56 @@ static void test_comma(void) release_test_context(&test_context); } +static void test_return(void) +{ + struct test_context test_context; + ID3D10Blob *ps_code = NULL; + struct vec4 v; + + static const char *void_source = + "void main(float x : TEXCOORD0, out float4 ret : COLOR)\n" + "{\n" + " ret = float4(0.1, 0.2, 0.3, 0.4);\n" + " return;\n" + " ret = float4(0.5, 0.6, 0.7, 0.8);\n" + "}"; + + static const char *implicit_conversion_source = + "float4 main(float x : TEXCOORD0) : COLOR\n" + "{\n" + " return float2x2(0.4, 0.3, 0.2, 0.1);\n" + "}"; + + if (!init_test_context(&test_context)) + return; + + todo_wine ps_code = compile_shader(void_source, "ps_2_0"); + if (ps_code) + { + draw_quad(test_context.device, ps_code); + + v = get_color_vec4(test_context.device, 0, 0); + ok(compare_vec4(&v, 0.1f, 0.2f, 0.3f, 0.4f, 0), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); + + ID3D10Blob_Release(ps_code); + } + + todo_wine ps_code = compile_shader(implicit_conversion_source, "ps_2_0"); + if (ps_code) + { + draw_quad(test_context.device, ps_code); + + v = get_color_vec4(test_context.device, 0, 0); + ok(compare_vec4(&v, 0.4f, 0.3f, 0.2f, 0.1f, 0), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); + + ID3D10Blob_Release(ps_code); + } + + release_test_context(&test_context); +} + static void test_fail(void) { static const char *tests[] = @@ -650,6 +700,21 @@ static void test_fail(void) " struct {} x = {};\n" " return y;\n" "}", + + "float4 test(float2 pos : TEXCOORD0) : SV_TARGET\n" + "{\n" + " return;\n" + "}", + + "void test(float2 pos : TEXCOORD0)\n" + "{\n" + " return pos;\n" + "}", + + "float4 test(float2 pos : TEXCOORD0) : SV_TARGET\n" + "{\n" + " return pos;\n" + "}", }; static const char *targets[] = {"ps_2_0", "ps_3_0", "ps_4_0"}; @@ -665,7 +730,7 @@ static void test_fail(void) compiled = errors = NULL; hr = ppD3DCompile(tests[i], strlen(tests[i]), NULL, NULL, NULL, "test", targets[j], 0, 0, &compiled, &errors); todo_wine ok(hr == E_FAIL, "Test %u, target %s, got unexpected hr %#x.\n", i, targets[j], hr); - todo_wine_if (i == 1) ok(!!errors, "Test %u, target %s, expected non-NULL error blob.\n", i, targets[j]); + todo_wine_if (i == 1 || i >= 8) ok(!!errors, "Test %u, target %s, expected non-NULL error blob.\n", i, targets[j]); ok(!compiled, "Test %u, target %s, expected no compiled shader blob.\n", i, targets[j]); if (errors) ID3D10Blob_Release(errors); @@ -710,5 +775,6 @@ START_TEST(hlsl_d3d9) test_float_vectors(); test_trig(); test_comma(); + test_return(); test_fail(); }

1 0