March 2021 - Wine-commits - list.winehq.org

Matteo Bruni : wined3d: Disable WINED3DFMT_NULL on backbuffer ORM.
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: wine Branch: master Commit: b67e9ddbb3567b0443b3895bf496c033db04f687 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b67e9ddbb3567b0443b3895b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Mar 5 17:06:24 2021 +0100 wined3d: Disable WINED3DFMT_NULL on backbuffer ORM. 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/utils.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 11df11fbcd9..9df51872d42 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3134,7 +3134,8 @@ static BOOL init_format_texture_info(struct wined3d_adapter *adapter, struct win && (format->f.flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_INTEGER)) continue; - if (wined3d_settings.offscreen_rendering_mode != ORM_FBO && format->f.id == WINED3DFMT_D16_LOCKABLE) + if (wined3d_settings.offscreen_rendering_mode != ORM_FBO + && (format->f.id == WINED3DFMT_D16_LOCKABLE || format->f.id == WINED3DFMT_NULL)) continue; format->internal = format_texture_info[i].gl_internal;

1 0

Zebediah Figura : strmbase: Merge qualitycontrol.c into renderer.c.
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: wine Branch: master Commit: 4f72fbef1197f636e4d519388121aea7f9925924 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f72fbef1197f636e4d51938… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 7 14:49:03 2021 -0600 strmbase: Merge qualitycontrol.c into renderer.c. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/Makefile.in | 1 - dlls/strmbase/qualitycontrol.c | 317 ------------------------------------- dlls/strmbase/renderer.c | 326 +++++++++++++++++++++++++++++++++++++++ dlls/strmbase/strmbase_private.h | 5 - dlls/wineqtdecoder/Makefile.in | 1 - include/wine/strmbase.h | 2 - 6 files changed, 326 insertions(+), 326 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4f72fbef1197f636e4d5…

1 0

Zebediah Figura : vkd3d-shader: Watch for allocation failure from yyparse().
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: vkd3d Branch: master Commit: b35fd8628e2bfb2d448cc0671a210217fe8c19e1 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b35fd8628e2bfb2d448cc06… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Mar 4 17:33:25 2021 -0600 vkd3d-shader: Watch for allocation failure from yyparse(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 02fa484..19bfc93 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1646,7 +1646,11 @@ int hlsl_compile_shader(const char *text, const struct vkd3d_shader_compile_info if (!hlsl_ctx_init(&ctx, message_context)) return VKD3D_ERROR_OUT_OF_MEMORY; - hlsl_lexer_compile(&ctx, text); + if (hlsl_lexer_compile(&ctx, text) == 2) + { + hlsl_ctx_cleanup(&ctx); + return VKD3D_ERROR_OUT_OF_MEMORY; + } if (ctx.failed) {

1 0

Zebediah Figura : vkd3d-shader: Use yy_scan_bytes() instead of yy_scan_string().
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: vkd3d Branch: master Commit: 001328e08497754a9ff8ceb66d563977a4563970 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=001328e08497754a9ff8ceb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Mar 4 17:33:28 2021 -0600 vkd3d-shader: Use yy_scan_bytes() instead of yy_scan_string(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 4 ++-- libs/vkd3d-shader/hlsl.h | 2 +- libs/vkd3d-shader/hlsl.l | 4 ++-- libs/vkd3d-shader/vkd3d_shader_main.c | 2 +- libs/vkd3d-shader/vkd3d_shader_private.h | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 19bfc93..e78f05c 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1618,7 +1618,7 @@ static void hlsl_ctx_cleanup(struct hlsl_ctx *ctx) hlsl_free_type(type); } -int hlsl_compile_shader(const char *text, const struct vkd3d_shader_compile_info *compile_info, +int hlsl_compile_shader(const struct vkd3d_shader_code *hlsl, const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *dxbc, struct vkd3d_shader_message_context *message_context) { const struct vkd3d_shader_hlsl_source_info *hlsl_source_info; @@ -1646,7 +1646,7 @@ int hlsl_compile_shader(const char *text, const struct vkd3d_shader_compile_info if (!hlsl_ctx_init(&ctx, message_context)) return VKD3D_ERROR_OUT_OF_MEMORY; - if (hlsl_lexer_compile(&ctx, text) == 2) + if (hlsl_lexer_compile(&ctx, hlsl) == 2) { hlsl_ctx_cleanup(&ctx); return VKD3D_ERROR_OUT_OF_MEMORY; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 4af021e..7673440 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -572,6 +572,6 @@ unsigned int hlsl_type_component_count(struct hlsl_type *type) DECLSPEC_HIDDEN; bool hlsl_type_is_row_major(const struct hlsl_type *type) DECLSPEC_HIDDEN; bool hlsl_type_is_void(const struct hlsl_type *type) DECLSPEC_HIDDEN; -int hlsl_lexer_compile(struct hlsl_ctx *ctx, const char *text) DECLSPEC_HIDDEN; +int hlsl_lexer_compile(struct hlsl_ctx *ctx, const struct vkd3d_shader_code *hlsl) DECLSPEC_HIDDEN; #endif diff --git a/libs/vkd3d-shader/hlsl.l b/libs/vkd3d-shader/hlsl.l index da54d57..cee98ea 100644 --- a/libs/vkd3d-shader/hlsl.l +++ b/libs/vkd3d-shader/hlsl.l @@ -282,13 +282,13 @@ static void update_location(struct hlsl_ctx *ctx, YYLTYPE *lloc) ctx->location.column += yyget_leng(ctx->scanner); } -int hlsl_lexer_compile(struct hlsl_ctx *ctx, const char *text) +int hlsl_lexer_compile(struct hlsl_ctx *ctx, const struct vkd3d_shader_code *hlsl) { YY_BUFFER_STATE buffer; int ret; yylex_init_extra(ctx, &ctx->scanner); - buffer = yy_scan_string(text, ctx->scanner); + buffer = yy_scan_bytes(hlsl->code, hlsl->size, ctx->scanner); yy_switch_to_buffer(buffer, ctx->scanner); ret = hlsl_yyparse(ctx->scanner, ctx); diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 5113624..2308b89 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -1047,7 +1047,7 @@ static int compile_hlsl(const struct vkd3d_shader_compile_info *compile_info, if ((ret = preproc_lexer_parse(compile_info, &preprocessed, message_context))) return ret; - ret = hlsl_compile_shader(preprocessed.code, compile_info, out, message_context); + ret = hlsl_compile_shader(&preprocessed, compile_info, out, message_context); vkd3d_shader_free_shader_code(&preprocessed); return ret; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index cf66c67..6d756e4 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -949,7 +949,7 @@ void vkd3d_compute_dxbc_checksum(const void *dxbc, size_t size, uint32_t checksu int preproc_lexer_parse(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out, struct vkd3d_shader_message_context *message_context) DECLSPEC_HIDDEN; -int hlsl_compile_shader(const char *text, const struct vkd3d_shader_compile_info *compile_info, +int hlsl_compile_shader(const struct vkd3d_shader_code *hlsl, const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *dxbc, struct vkd3d_shader_message_context *message_context) DECLSPEC_HIDDEN; static inline enum vkd3d_shader_component_type vkd3d_component_type_from_data_type(

1 0

Francois Gouget : testbot/web: Make the CollectionBlock <th> cells sticky.
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: tools Branch: master Commit: 725cb7f6f1ccc09507714b6009c805a496047baf URL: https://source.winehq.org/git/tools.git/?a=commit;h=725cb7f6f1ccc09507714b6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 8 01:50:09 2021 +0100 testbot/web: Make the CollectionBlock <th> cells sticky. This keeps the table header visible, making long tables easier to read. The header disappears when scrolling past the table so this does not impact the remainder of the page. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/WineTestBot.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index 3fccbd2..6d170b1 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -232,6 +232,8 @@ h2 padding: 4px; margin: 0; border: 1px solid white; + position: sticky; + top: 0; } .CollectionBlock td

1 0

Francois Gouget : testbot/web: Remove a duplicate </tbody> on the Stats page.
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: tools Branch: master Commit: e2940cb5dae99a8528628df512640588443ea189 URL: https://source.winehq.org/git/tools.git/?a=commit;h=e2940cb5dae99a8528628df… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 8 01:50:29 2021 +0100 testbot/web: Remove a duplicate </tbody> on the Stats page. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Stats.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/Stats.pl b/testbot/web/Stats.pl index 4a70cb0..bf7f9ba 100644 --- a/testbot/web/Stats.pl +++ b/testbot/web/Stats.pl @@ -429,7 +429,7 @@ sub GenerateFooter($) print "<p>The errors section shows how many <b>Timeouts</b> occurred, that is how many tasks failed to complete within the allotted time; how many failed due to a <b>TestBot error</b>; and how many had to be rerun due to a <b>Transient error</b> such as a network connection issue.</p>\n"; print "</td></tr></tbody>\n"; - print "</tbody></table></div>\n"; + print "</table></div>\n"; print "<p class='GeneralFooterText'>Generated in ", Elapsed($self->{start}), " s</p>\n"; print "</div>\n"; }

1 0

Francois Gouget : testbot/web: Use <thead> for the CollectionBlock table headers.
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: tools Branch: master Commit: 0b2642d3c6c4e5ebd89e0aa2ea08de4dddb6c5b8 URL: https://source.winehq.org/git/tools.git/?a=commit;h=0b2642d3c6c4e5ebd89e0aa… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 8 01:50:50 2021 +0100 testbot/web: Use <thead> for the CollectionBlock table headers. It usually does not make any difference but is good practice. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index b523d14..058bb47 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -107,10 +107,12 @@ EOF print "<table border='0' cellpadding='5' cellspacing='0' summary='" . "Overview of " . $Collection->GetCollectionName() . "'>\n"; - print "<tbody>\n"; + print "<thead>\n"; my $Actions = $self->CallGetItemActions(); $self->CallGenerateHeaderRow($PropertyDescriptors, $Actions); + print "</thead>\n"; + print "<tbody>\n"; my $DetailsPage = $self->CallGetDetailsPage(); my $Row = 0; my $Keys = $self->CallSortKeys($self->{Collection}->GetKeys());

1 0

Francois Gouget : testbot/PatchUtils: Fix the module name for directories containing dots.
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: tools Branch: master Commit: c4d02668c9e46a4063055b5e9b5be1cd1d1aa7f1 URL: https://source.winehq.org/git/tools.git/?a=commit;h=c4d02668c9e46a4063055b5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 8 13:40:51 2021 +0100 testbot/PatchUtils: Fix the module name for directories containing dots. Wine forces dlls that contain dots in their names to be implemented in a folder ending in '.dll'. But the module name and test executables don't have this extra 'extension' and thus deriving them from the patched filename requires special treatment. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/PatchUtils.pm | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index aeb8743..37b1b77 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -44,6 +44,20 @@ use WineTestBot::Utils; # Source repository maintenance # +sub _Dir2ModuleName($$) +{ + my ($Root, $Dir) = @_; + + # Add a .exe extension to program directory names, but not if they already + # contain some other extension. + return "$Dir.exe" if ($Root eq "programs" and $Dir !~ /\./); + + # Dll directory names can normally be used as is, except if a '.dll' + # extension was added because they contain dots. + $Dir =~ s/\.dll$//; + return $Dir; +} + =pod =over 12 @@ -107,7 +121,7 @@ sub _LoadWineFiles() my ($Root, $Module, $File) = ($1, $2, $3); next if ($File eq "testlist.c"); next if ($File !~ /\.(?:c|spec)$/); - $Module .= ".exe" if ($Root eq "programs" and $Module !~ /\./); + $Module = _Dir2ModuleName($Root, $Module); $_TestList->{$Module}->{$File} = 1; } } @@ -177,8 +191,7 @@ sub _CreateTestInfo($$$) { my ($Impacts, $Root, $Dir) = @_; - # Don't add an extension to programs that have one already - my $Module = ($Root eq "programs" and $Dir !~ /\./) ? "$Dir.exe" : $Dir; + my $Module = _Dir2ModuleName($Root, $Dir); $Impacts->{BuildModules}->{$Module} = 1; $Impacts->{IsWinePatch} = 1;

1 0

Zebediah Figura : wined3d: Move the "state" field from struct wined3d_device to struct wined3d_device_context.
by Alexandre Julliard 05 Mar '21

05 Mar '21

Module: wine Branch: master Commit: 94607a1598bc2ed2f74566f9eb9c56043dbd0116 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94607a1598bc2ed2f74566f9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 4 21:29:48 2021 -0600 wined3d: Move the "state" field from struct wined3d_device to struct wined3d_device_context. 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/wined3d/cs.c | 18 ++-- dlls/wined3d/device.c | 189 +++++++++++++++++++---------------------- dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d_private.h | 3 +- 4 files changed, 103 insertions(+), 109 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=94607a1598bc2ed2f745…

1 0

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_shader().
by Alexandre Julliard 05 Mar '21

05 Mar '21

Module: wine Branch: master Commit: f1842d5ba44c9309b015275b0f599f7be7d99cf3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1842d5ba44c9309b015275b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 4 21:29:49 2021 -0600 wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_shader(). 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/wined3d/cs.c | 7 ++++--- dlls/wined3d/device.c | 14 +++++++------- dlls/wined3d/wined3d_private.h | 5 +++-- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index d67582116b0..5176c635cf5 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1622,16 +1622,17 @@ static void wined3d_cs_exec_set_shader(struct wined3d_cs *cs, const void *data) device_invalidate_state(cs->c.device, STATE_COMPUTE_SHADER_RESOURCE_BINDING); } -void wined3d_cs_emit_set_shader(struct wined3d_cs *cs, enum wined3d_shader_type type, struct wined3d_shader *shader) +void wined3d_device_context_emit_set_shader(struct wined3d_device_context *context, + enum wined3d_shader_type type, struct wined3d_shader *shader) { struct wined3d_cs_set_shader *op; - op = wined3d_device_context_require_space(&cs->c, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_SHADER; op->type = type; op->shader = shader; - wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT); + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_blend_state(struct wined3d_cs *cs, const void *data) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f4811e26018..e6ac3621d4e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1959,7 +1959,7 @@ void CDECL wined3d_device_set_state(struct wined3d_device *device, struct wined3 for (i = 0; i < WINED3D_SHADER_TYPE_COUNT; ++i) { - wined3d_cs_emit_set_shader(device->cs, i, state->shader[i]); + wined3d_device_context_emit_set_shader(&device->cs->c, i, state->shader[i]); for (j = 0; j < MAX_CONSTANT_BUFFERS; ++j) { wined3d_cs_emit_set_constant_buffer(device->cs, i, j, state->cb[i][j]); @@ -2095,7 +2095,7 @@ void CDECL wined3d_device_set_vertex_shader(struct wined3d_device *device, struc if (shader) wined3d_shader_incref(shader); state->shader[WINED3D_SHADER_TYPE_VERTEX] = shader; - wined3d_cs_emit_set_shader(device->cs, WINED3D_SHADER_TYPE_VERTEX, shader); + wined3d_device_context_emit_set_shader(&device->cs->c, WINED3D_SHADER_TYPE_VERTEX, shader); if (prev) wined3d_shader_decref(prev); } @@ -2333,7 +2333,7 @@ void CDECL wined3d_device_set_pixel_shader(struct wined3d_device *device, struct if (shader) wined3d_shader_incref(shader); state->shader[WINED3D_SHADER_TYPE_PIXEL] = shader; - wined3d_cs_emit_set_shader(device->cs, WINED3D_SHADER_TYPE_PIXEL, shader); + wined3d_device_context_emit_set_shader(&device->cs->c, WINED3D_SHADER_TYPE_PIXEL, shader); if (prev) wined3d_shader_decref(prev); } @@ -2442,7 +2442,7 @@ void CDECL wined3d_device_set_hull_shader(struct wined3d_device *device, struct if (shader) wined3d_shader_incref(shader); state->shader[WINED3D_SHADER_TYPE_HULL] = shader; - wined3d_cs_emit_set_shader(device->cs, WINED3D_SHADER_TYPE_HULL, shader); + wined3d_device_context_emit_set_shader(&device->cs->c, WINED3D_SHADER_TYPE_HULL, shader); if (prev) wined3d_shader_decref(prev); } @@ -2498,7 +2498,7 @@ void CDECL wined3d_device_set_domain_shader(struct wined3d_device *device, struc if (shader) wined3d_shader_incref(shader); state->shader[WINED3D_SHADER_TYPE_DOMAIN] = shader; - wined3d_cs_emit_set_shader(device->cs, WINED3D_SHADER_TYPE_DOMAIN, shader); + wined3d_device_context_emit_set_shader(&device->cs->c, WINED3D_SHADER_TYPE_DOMAIN, shader); if (prev) wined3d_shader_decref(prev); } @@ -2554,7 +2554,7 @@ void CDECL wined3d_device_set_geometry_shader(struct wined3d_device *device, str if (shader) wined3d_shader_incref(shader); state->shader[WINED3D_SHADER_TYPE_GEOMETRY] = shader; - wined3d_cs_emit_set_shader(device->cs, WINED3D_SHADER_TYPE_GEOMETRY, shader); + wined3d_device_context_emit_set_shader(&device->cs->c, WINED3D_SHADER_TYPE_GEOMETRY, shader); if (prev) wined3d_shader_decref(prev); } @@ -2609,7 +2609,7 @@ void CDECL wined3d_device_set_compute_shader(struct wined3d_device *device, stru if (shader) wined3d_shader_incref(shader); state->shader[WINED3D_SHADER_TYPE_COMPUTE] = shader; - wined3d_cs_emit_set_shader(device->cs, WINED3D_SHADER_TYPE_COMPUTE, shader); + wined3d_device_context_emit_set_shader(&device->cs->c, WINED3D_SHADER_TYPE_COMPUTE, shader); if (prev) wined3d_shader_decref(prev); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 66757b30a16..a16da66b309 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4774,8 +4774,6 @@ void wined3d_cs_emit_set_sampler(struct wined3d_cs *cs, enum wined3d_shader_type void wined3d_cs_emit_set_sampler_state(struct wined3d_cs *cs, UINT sampler_idx, enum wined3d_sampler_state state, DWORD value) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_scissor_rects(struct wined3d_cs *cs, unsigned int rect_count, const RECT *rects) DECLSPEC_HIDDEN; -void wined3d_cs_emit_set_shader(struct wined3d_cs *cs, enum wined3d_shader_type type, - struct wined3d_shader *shader) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_stream_output(struct wined3d_cs *cs, UINT stream_idx, struct wined3d_buffer *buffer, UINT offset) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_stream_source(struct wined3d_cs *cs, UINT stream_idx, @@ -4815,6 +4813,9 @@ static inline void wined3d_cs_push_constants(struct wined3d_cs *cs, enum wined3d cs->c.ops->push_constants(&cs->c, p, start_idx, count, constants); } +void wined3d_device_context_emit_set_shader(struct wined3d_device_context *context, enum wined3d_shader_type type, + struct wined3d_shader *shader) DECLSPEC_HIDDEN; + static inline void wined3d_resource_wait_idle(struct wined3d_resource *resource) { const struct wined3d_cs *cs = resource->device->cs;

1 0