wine-commits March 2017

wine-commits@winehq.org

2 participants
717 discussions

Jacek Caban : server: Store connected pipe_end in pipe_end struct.
by Alexandre Julliard 20 Mar '17

20 Mar '17

Module: wine Branch: master Commit: 316112e3b471b7879e1090c12300f39da6068856 URL: http://source.winehq.org/git/wine.git/?a=commit;h=316112e3b471b7879e1090c12… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 15 23:25:25 2017 +0100 server: Store connected pipe_end in pipe_end struct. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/named_pipe.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/server/named_pipe.c b/server/named_pipe.c index 6861e0f..55febd7 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -70,6 +70,7 @@ struct pipe_end struct object obj; /* object header */ struct fd *fd; /* pipe file descriptor */ unsigned int flags; /* pipe flags */ + struct pipe_end *connection; /* the other end of the pipe */ }; struct pipe_server @@ -368,6 +369,19 @@ static void notify_empty( struct pipe_server *server ) fd_async_wake_up( server->pipe_end.fd, ASYNC_TYPE_WAIT, STATUS_SUCCESS ); } +static void pipe_end_disconnect( struct pipe_end *pipe_end, unsigned int status ) +{ + struct pipe_end *connection = pipe_end->connection; + + pipe_end->connection = NULL; + + if (connection) + { + connection->connection = NULL; + pipe_end_disconnect( connection, status ); + } +} + static void do_disconnect( struct pipe_server *server ) { /* we may only have a server fd, if the client disconnected */ @@ -390,6 +404,8 @@ static void pipe_server_destroy( struct object *obj) assert( obj->ops == &pipe_server_ops ); + pipe_end_disconnect( &server->pipe_end, STATUS_PIPE_BROKEN ); + if (server->pipe_end.fd) { notify_empty( server ); @@ -417,6 +433,8 @@ static void pipe_client_destroy( struct object *obj) assert( obj->ops == &pipe_client_ops ); + pipe_end_disconnect( &client->pipe_end, STATUS_PIPE_BROKEN ); + if (server) { notify_empty( server ); @@ -641,6 +659,7 @@ static obj_handle_t pipe_server_ioctl( struct fd *fd, ioctl_code_t code, struct notify_empty( server ); /* dump the client and server fds - client loses all waiting data */ + pipe_end_disconnect( &server->pipe_end, STATUS_PIPE_DISCONNECTED ); do_disconnect( server ); server->client->server = NULL; server->client = NULL; @@ -648,6 +667,7 @@ static obj_handle_t pipe_server_ioctl( struct fd *fd, ioctl_code_t code, struct break; case ps_wait_disconnect: assert( !server->client ); + pipe_end_disconnect( &server->pipe_end, STATUS_PIPE_DISCONNECTED ); do_disconnect( server ); set_server_state( server, ps_wait_connect ); break; @@ -678,6 +698,7 @@ static void init_pipe_end( struct pipe_end *pipe_end, unsigned int pipe_flags ) { pipe_end->fd = NULL; pipe_end->flags = pipe_flags; + pipe_end->connection = NULL; } static struct pipe_server *create_pipe_server( struct named_pipe *pipe, unsigned int options, @@ -829,6 +850,11 @@ static struct object *named_pipe_open_file( struct object *obj, unsigned int acc release_object( client ); client = NULL; } + if (client) + { + server->pipe_end.connection = &client->pipe_end; + client->pipe_end.connection = &server->pipe_end; + } } release_object( server ); return &client->pipe_end.obj;

1 0

Zhenbo Li : quartz: Remove an unnecessary if.
by Alexandre Julliard 20 Mar '17

20 Mar '17

Module: wine Branch: master Commit: 1f765fb0bb1197a925945365e5eca6fbf8e2153d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f765fb0bb1197a925945365e… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Mon Mar 20 13:16:31 2017 +0800 quartz: Remove an unnecessary if. Signed-off-by: Zhenbo Li <litimetal(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 92c30c1..f9bc47b 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1542,8 +1542,7 @@ static HRESULT WINAPI FilterGraph2_RenderFile(IFilterGraph2 *iface, LPCWSTR lpcw if (FAILED(hr)) return hr; - if (SUCCEEDED(hr)) - hr = IBaseFilter_EnumPins(preader, &penumpins); + hr = IBaseFilter_EnumPins(preader, &penumpins); if (SUCCEEDED(hr)) { while (IEnumPins_Next(penumpins, 1, &ppinreader, NULL) == S_OK)

1 0

Akihiro Sagawa : explorer: Use neutral language for the version resource.
by Alexandre Julliard 20 Mar '17

20 Mar '17

Module: wine Branch: master Commit: ecd34e5896ba8c9900fdc5e0ef40a4f6737da57f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecd34e5896ba8c9900fdc5e0e… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Mar 20 21:44:04 2017 +0900 explorer: Use neutral language for the version resource. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/explorer.rc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/programs/explorer/explorer.rc b/programs/explorer/explorer.rc index 53224a8..b9ca5d8 100644 --- a/programs/explorer/explorer.rc +++ b/programs/explorer/explorer.rc @@ -33,6 +33,8 @@ STRINGTABLE IDS_RUN "&Run..." } +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + #define WINE_FILEDESCRIPTION_STR "Wine Explorer" #define WINE_FILENAME_STR "explorer.exe" #define WINE_FILEVERSION 6,1,7601,17567

1 0

Akihiro Sagawa : regsvr32: Use neutral language for the version resource.
by Alexandre Julliard 20 Mar '17

20 Mar '17

Module: wine Branch: master Commit: cd37c6e13b3632af2f0a5f4b11f94e492369d967 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd37c6e13b3632af2f0a5f4b1… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Mar 20 21:44:03 2017 +0900 regsvr32: Use neutral language for the version resource. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regsvr32/regsvr32.rc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/programs/regsvr32/regsvr32.rc b/programs/regsvr32/regsvr32.rc index 3169b71..c7fc2c3 100644 --- a/programs/regsvr32/regsvr32.rc +++ b/programs/regsvr32/regsvr32.rc @@ -50,6 +50,8 @@ Options:\n\ STRING_UNINSTALL_SUCCESSFUL, "regsvr32: Successfully uninstalled DLL '%1'\n" } +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + #define WINE_FILEDESCRIPTION_STR "Wine Register Server" #define WINE_FILENAME_STR "REGSVR32.EXE" #define WINE_FILETYPE VFT_APP

1 0

Józef Kucia : wined3d: Remove irrelevant comment.
by Alexandre Julliard 20 Mar '17

20 Mar '17

Module: wine Branch: master Commit: 2c7381e3296e424350ec009c0ae127dff38defa8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c7381e3296e424350ec009c0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Mar 20 12:13:10 2017 +0100 wined3d: Remove irrelevant comment. The transform_texture() function calls context_active_texture(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/state.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 8ff1b46..7ad98b8 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3494,10 +3494,7 @@ static void sampler_texmatrix(struct wined3d_context *context, const struct wine /* The fixed function np2 texture emulation uses the texture matrix to fix up the coordinates * wined3d_texture_apply_state_changes() multiplies the set matrix with a fixup matrix. Before the - * scaling is reapplied or removed, the texture matrix has to be reapplied - * - * The mapped stage is already active because the sampler() function below, which is part of the - * misc pipeline + * scaling is reapplied or removed, the texture matrix has to be reapplied. */ if (sampler < MAX_TEXTURES) { @@ -3599,7 +3596,6 @@ static void sampler(struct wined3d_context *context, const struct wined3d_state TRACE("Sampler %u.\n", sampler_idx); - if (mapped_stage == WINED3D_UNMAPPED_STAGE) { TRACE("No sampler mapped to stage %u. Returning.\n", sampler_idx);

1 0

Józef Kucia : wined3d: Abort state application when there is problem with newly created sampler object.
by Alexandre Julliard 20 Mar '17

20 Mar '17

Module: wine Branch: master Commit: de0a88538c9f8554a8658a90c5d4175121647aaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=de0a88538c9f8554a8658a90c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Mar 20 12:13:09 2017 +0100 wined3d: Abort state application when there is problem with newly created sampler object. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/state.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 409c161..8ff1b46 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3633,17 +3633,17 @@ static void sampler(struct wined3d_context *context, const struct wined3d_state if (FAILED(wined3d_sampler_create(device, &desc, NULL, &sampler))) { ERR("Failed to create sampler.\n"); - sampler = NULL; + return; } - else + if (wine_rb_put(&device->samplers, &desc, &sampler->entry) == -1) { - if (wine_rb_put(&device->samplers, &desc, &sampler->entry) == -1) - ERR("Failed to insert sampler.\n"); + ERR("Failed to insert sampler.\n"); + wined3d_sampler_decref(sampler); + return; } } - if (sampler) - wined3d_sampler_bind(sampler, mapped_stage, texture, context); + wined3d_sampler_bind(sampler, mapped_stage, texture, context); /* Trigger shader constant reloading (for NP2 texcoord fixup) */ if (!(texture->flags & WINED3D_TEXTURE_POW2_MAT_IDENT))

1 0

Józef Kucia : wined3d: Make wined3d samplers responsible for setting texture base level.
by Alexandre Julliard 20 Mar '17

20 Mar '17

Module: wine Branch: master Commit: ec1da699d947d077ce4fe22a8119a7528296a1da URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec1da699d947d077ce4fe22a8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Mar 20 12:13:08 2017 +0100 wined3d: Make wined3d samplers responsible for setting texture base level. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/state.c | 1 + dlls/wined3d/device.c | 1 + dlls/wined3d/sampler.c | 28 ++++++++++++++++++++++++++++ dlls/wined3d/state.c | 22 +--------------------- include/wine/wined3d.h | 1 + 5 files changed, 32 insertions(+), 21 deletions(-) diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 77c8e55..0a16e58 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -1205,6 +1205,7 @@ HRESULT d3d_sampler_state_init(struct d3d_sampler_state *state, struct d3d_devic wined3d_desc.lod_bias = desc->MipLODBias; wined3d_desc.min_lod = desc->MinLOD; wined3d_desc.max_lod = desc->MaxLOD; + wined3d_desc.mip_base_level = 0; wined3d_desc.max_anisotropy = D3D11_DECODE_IS_ANISOTROPIC_FILTER(desc->Filter) ? desc->MaxAnisotropy : 1; wined3d_desc.compare = wined3d_texture_compare_from_d3d11(desc->Filter); wined3d_desc.comparison_func = wined3d_cmp_func_from_d3d11(desc->ComparisonFunc); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a34cb97..9b0fcfb 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -788,6 +788,7 @@ static void create_default_samplers(struct wined3d_device *device, struct wined3 desc.lod_bias = 0.0f; desc.min_lod = -1000.0f; desc.max_lod = 1000.0f; + desc.mip_base_level = 0; desc.max_anisotropy = 1; desc.compare = FALSE; desc.comparison_func = WINED3D_CMP_NEVER; diff --git a/dlls/wined3d/sampler.c b/dlls/wined3d/sampler.c index c1364c2..294d766 100644 --- a/dlls/wined3d/sampler.c +++ b/dlls/wined3d/sampler.c @@ -151,6 +151,31 @@ HRESULT CDECL wined3d_sampler_create(struct wined3d_device *device, const struct return WINED3D_OK; } +static void texture_apply_base_level(struct wined3d_texture *texture, + const struct wined3d_sampler_desc *desc, const struct wined3d_gl_info *gl_info) +{ + struct gl_texture *gl_tex; + unsigned int base_level; + + if (texture->flags & WINED3D_TEXTURE_COND_NP2) + base_level = 0; + else if (desc->mip_filter == WINED3D_TEXF_NONE) + base_level = texture->lod; + else + base_level = min(max(desc->mip_base_level, texture->lod), texture->level_count - 1); + + gl_tex = wined3d_texture_get_gl_texture(texture, texture->flags & WINED3D_TEXTURE_IS_SRGB); + if (base_level != gl_tex->base_level) + { + /* Note that WINED3D_SAMP_MAX_MIP_LEVEL specifies the largest mipmap + * (default 0), while GL_TEXTURE_MAX_LEVEL specifies the smallest + * mipmap used (default 1000). So WINED3D_SAMP_MAX_MIP_LEVEL + * corresponds to GL_TEXTURE_BASE_LEVEL. */ + gl_info->gl_ops.gl.p_glTexParameteri(texture->target, GL_TEXTURE_BASE_LEVEL, base_level); + gl_tex->base_level = base_level; + } +} + /* This function relies on the correct texture being bound and loaded. */ void wined3d_sampler_bind(struct wined3d_sampler *sampler, unsigned int unit, struct wined3d_texture *texture, const struct wined3d_context *context) @@ -170,4 +195,7 @@ void wined3d_sampler_bind(struct wined3d_sampler *sampler, unsigned int unit, { ERR("Could not apply sampler state.\n"); } + + if (texture) + texture_apply_base_level(texture, &sampler->desc, gl_info); } diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 7fcd2b9..409c161 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3562,6 +3562,7 @@ static void wined3d_sampler_desc_from_sampler_states(struct wined3d_sampler_desc desc->lod_bias = lod_bias.f; desc->min_lod = -1000.0f; desc->max_lod = 1000.0f; + desc->mip_base_level = sampler_states[WINED3D_SAMP_MAX_MIP_LEVEL]; desc->max_anisotropy = sampler_states[WINED3D_SAMP_MAX_ANISOTROPY]; if ((sampler_states[WINED3D_SAMP_MAG_FILTER] != WINED3D_TEXF_ANISOTROPIC && sampler_states[WINED3D_SAMP_MIN_FILTER] != WINED3D_TEXF_ANISOTROPIC @@ -3618,8 +3619,6 @@ static void sampler(struct wined3d_context *context, const struct wined3d_state struct wined3d_sampler_desc desc; struct wined3d_sampler *sampler; struct wine_rb_entry *entry; - struct gl_texture *gl_tex; - unsigned int base_level; wined3d_sampler_desc_from_sampler_states(&desc, context, sampler_states, texture); @@ -3646,25 +3645,6 @@ static void sampler(struct wined3d_context *context, const struct wined3d_state if (sampler) wined3d_sampler_bind(sampler, mapped_stage, texture, context); - if (texture->flags & WINED3D_TEXTURE_COND_NP2) - base_level = 0; - else if (desc.mip_filter == WINED3D_TEXF_NONE) - base_level = texture->lod; - else - base_level = min(max(sampler_states[WINED3D_SAMP_MAX_MIP_LEVEL], - texture->lod), texture->level_count - 1); - - gl_tex = wined3d_texture_get_gl_texture(texture, texture->flags & WINED3D_TEXTURE_IS_SRGB); - if (base_level != gl_tex->base_level) - { - /* Note that WINED3D_SAMP_MAX_MIP_LEVEL specifies the largest mipmap - * (default 0), while GL_TEXTURE_MAX_LEVEL specifies the smallest - * mipmap used (default 1000). So WINED3D_SAMP_MAX_MIP_LEVEL - * corresponds to GL_TEXTURE_BASE_LEVEL. */ - gl_info->gl_ops.gl.p_glTexParameteri(texture->target, GL_TEXTURE_BASE_LEVEL, base_level); - gl_tex->base_level = base_level; - } - /* Trigger shader constant reloading (for NP2 texcoord fixup) */ if (!(texture->flags & WINED3D_TEXTURE_POW2_MAT_IDENT)) context->constant_update_mask |= WINED3D_SHADER_CONST_PS_NP2_FIXUP; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index acdb4f3..3b0f6db 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1942,6 +1942,7 @@ struct wined3d_sampler_desc float lod_bias; float min_lod; float max_lod; + unsigned int mip_base_level; unsigned int max_anisotropy; BOOL compare; enum wined3d_cmp_func comparison_func;

1 0

Józef Kucia : wined3d: Use wined3d samplers unconditionally for applying legacy sampler states.
by Alexandre Julliard 20 Mar '17

20 Mar '17

Module: wine Branch: master Commit: 591a3b1be84c1f3599fdc31b26d43facbbd9781f URL: http://source.winehq.org/git/wine.git/?a=commit;h=591a3b1be84c1f3599fdc31b2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Mar 20 12:13:07 2017 +0100 wined3d: Use wined3d samplers unconditionally for applying legacy sampler states. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/state.c | 40 +++++++++++++++------------------------- 1 file changed, 15 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 8084cfb..7fcd2b9 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3611,51 +3611,41 @@ static void sampler(struct wined3d_context *context, const struct wined3d_state if (state->textures[sampler_idx]) { - struct wined3d_texture *texture = state->textures[sampler_idx]; BOOL srgb = state->sampler_states[sampler_idx][WINED3D_SAMP_SRGB_TEXTURE]; const DWORD *sampler_states = state->sampler_states[sampler_idx]; + struct wined3d_texture *texture = state->textures[sampler_idx]; + struct wined3d_device *device = context->device; struct wined3d_sampler_desc desc; + struct wined3d_sampler *sampler; + struct wine_rb_entry *entry; struct gl_texture *gl_tex; unsigned int base_level; wined3d_sampler_desc_from_sampler_states(&desc, context, sampler_states, texture); wined3d_texture_bind(texture, context, srgb); - if (!gl_info->supported[ARB_SAMPLER_OBJECTS]) + + if ((entry = wine_rb_get(&device->samplers, &desc))) { - wined3d_texture_apply_sampler_desc(texture, &desc, context); + sampler = WINE_RB_ENTRY_VALUE(entry, struct wined3d_sampler, entry); } else { - struct wined3d_device *device = context->device; - struct wined3d_sampler *sampler; - struct wine_rb_entry *entry; - - if ((entry = wine_rb_get(&device->samplers, &desc))) + if (FAILED(wined3d_sampler_create(device, &desc, NULL, &sampler))) { - sampler = WINE_RB_ENTRY_VALUE(entry, struct wined3d_sampler, entry); + ERR("Failed to create sampler.\n"); + sampler = NULL; } else { - if (FAILED(wined3d_sampler_create(device, &desc, NULL, &sampler))) - { - ERR("Failed to create sampler.\n"); - sampler = NULL; - } - else - { - if (wine_rb_put(&device->samplers, &desc, &sampler->entry) == -1) - ERR("Failed to insert sampler.\n"); - } - } - - if (sampler) - { - GL_EXTCALL(glBindSampler(mapped_stage, sampler->name)); - checkGLcall("glBindSampler"); + if (wine_rb_put(&device->samplers, &desc, &sampler->entry) == -1) + ERR("Failed to insert sampler.\n"); } } + if (sampler) + wined3d_sampler_bind(sampler, mapped_stage, texture, context); + if (texture->flags & WINED3D_TEXTURE_COND_NP2) base_level = 0; else if (desc.mip_filter == WINED3D_TEXF_NONE)

1 0

Józef Kucia : wined3d: Introduce wined3d_sampler_bind () helper function.
by Alexandre Julliard 20 Mar '17

20 Mar '17

Module: wine Branch: master Commit: 584ec259b25bdde4b5ae0bb52cab438fbe76c84a URL: http://source.winehq.org/git/wine.git/?a=commit;h=584ec259b25bdde4b5ae0bb52… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Mar 20 12:13:06 2017 +0100 wined3d: Introduce wined3d_sampler_bind() helper function. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 16 ++++------------ dlls/wined3d/sampler.c | 21 +++++++++++++++++++++ dlls/wined3d/view.c | 7 ++++++- dlls/wined3d/wined3d_private.h | 7 +++++-- 4 files changed, 36 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index baba979..c1803a4 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3394,14 +3394,12 @@ static void context_bind_shader_resources(struct wined3d_context *context, const struct wined3d_state *state, enum wined3d_shader_type shader_type) { unsigned int bind_idx, shader_sampler_count, base, count, i; - const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_device *device = context->device; struct wined3d_shader_sampler_map_entry *entry; struct wined3d_shader_resource_view *view; const struct wined3d_shader *shader; struct wined3d_sampler *sampler; const DWORD *tex_unit_map; - GLuint sampler_name; if (!(shader = state->shader[shader_type])) return; @@ -3429,16 +3427,10 @@ static void context_bind_shader_resources(struct wined3d_context *context, } if (entry->sampler_idx == WINED3D_SAMPLER_DEFAULT) - sampler_name = device->default_sampler->name; - else if ((sampler = state->sampler[shader_type][entry->sampler_idx])) - sampler_name = sampler->name; - else - sampler_name = device->null_sampler->name; - - context_active_texture(context, gl_info, bind_idx); - GL_EXTCALL(glBindSampler(bind_idx, sampler_name)); - checkGLcall("glBindSampler"); - wined3d_shader_resource_view_bind(view, context); + sampler = device->default_sampler; + else if (!(sampler = state->sampler[shader_type][entry->sampler_idx])) + sampler = device->null_sampler; + wined3d_shader_resource_view_bind(view, bind_idx, sampler, context); } } diff --git a/dlls/wined3d/sampler.c b/dlls/wined3d/sampler.c index a987a35..c1364c2 100644 --- a/dlls/wined3d/sampler.c +++ b/dlls/wined3d/sampler.c @@ -150,3 +150,24 @@ HRESULT CDECL wined3d_sampler_create(struct wined3d_device *device, const struct return WINED3D_OK; } + +/* This function relies on the correct texture being bound and loaded. */ +void wined3d_sampler_bind(struct wined3d_sampler *sampler, unsigned int unit, + struct wined3d_texture *texture, const struct wined3d_context *context) +{ + const struct wined3d_gl_info *gl_info = context->gl_info; + + if (gl_info->supported[ARB_SAMPLER_OBJECTS]) + { + GL_EXTCALL(glBindSampler(unit, sampler->name)); + checkGLcall("bind sampler"); + } + else if (texture) + { + wined3d_texture_apply_sampler_desc(texture, &sampler->desc, context); + } + else + { + ERR("Could not apply sampler state.\n"); + } +} diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index ff31de2..ac558a4 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -638,13 +638,17 @@ HRESULT CDECL wined3d_shader_resource_view_create(const struct wined3d_view_desc } void wined3d_shader_resource_view_bind(struct wined3d_shader_resource_view *view, - struct wined3d_context *context) + unsigned int unit, struct wined3d_sampler *sampler, struct wined3d_context *context) { + const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_texture *texture; + context_active_texture(context, gl_info, unit); + if (view->gl_view.name) { context_bind_texture(context, view->gl_view.target, view->gl_view.name); + wined3d_sampler_bind(sampler, unit, NULL, context); return; } @@ -656,6 +660,7 @@ void wined3d_shader_resource_view_bind(struct wined3d_shader_resource_view *view texture = wined3d_texture_from_resource(view->resource); wined3d_texture_bind(texture, context, FALSE); + wined3d_sampler_bind(sampler, unit, texture, context); } ULONG CDECL wined3d_unordered_access_view_incref(struct wined3d_unordered_access_view *view) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3b342d8..21c5f1b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3087,6 +3087,9 @@ struct wined3d_sampler GLuint name; }; +void wined3d_sampler_bind(struct wined3d_sampler *sampler, unsigned int unit, + struct wined3d_texture *texture, const struct wined3d_context *context) DECLSPEC_HIDDEN; + struct wined3d_vertex_declaration_element { const struct wined3d_format *format; @@ -3415,8 +3418,8 @@ struct wined3d_shader_resource_view struct wined3d_gl_view gl_view; }; -void wined3d_shader_resource_view_bind(struct wined3d_shader_resource_view *view, - struct wined3d_context *context) DECLSPEC_HIDDEN; +void wined3d_shader_resource_view_bind(struct wined3d_shader_resource_view *view, unsigned int unit, + struct wined3d_sampler *sampler, struct wined3d_context *context) DECLSPEC_HIDDEN; struct wined3d_unordered_access_view {

1 0

Józef Kucia : wined3d: Create wined3d sampler for NULL sampler.
by Alexandre Julliard 20 Mar '17

20 Mar '17

Module: wine Branch: master Commit: f82a437a90280b8682dd22169cb335a1dc4c6fbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=f82a437a90280b8682dd22169… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Mar 20 12:13:05 2017 +0100 wined3d: Create wined3d sampler for NULL sampler. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 2 +- dlls/wined3d/device.c | 35 ++++++++++++----------------------- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 14 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index b554b00..baba979 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3433,7 +3433,7 @@ static void context_bind_shader_resources(struct wined3d_context *context, else if ((sampler = state->sampler[shader_type][entry->sampler_idx])) sampler_name = sampler->name; else - sampler_name = device->null_sampler; + sampler_name = device->null_sampler->name; context_active_texture(context, gl_info, bind_idx); GL_EXTCALL(glBindSampler(bind_idx, sampler_name)); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ba30d20..a34cb97 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -775,7 +775,6 @@ static void destroy_dummy_textures(struct wined3d_device *device, struct wined3d /* Context activation is done by the caller. */ static void create_default_samplers(struct wined3d_device *device, struct wined3d_context *context) { - const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_sampler_desc desc; HRESULT hr; @@ -806,37 +805,27 @@ static void create_default_samplers(struct wined3d_device *device, struct wined3 device->default_sampler = NULL; } - if (gl_info->supported[ARB_SAMPLER_OBJECTS]) + /* In D3D10+, a NULL sampler maps to the default sampler state. */ + desc.address_u = WINED3D_TADDRESS_CLAMP; + desc.address_v = WINED3D_TADDRESS_CLAMP; + desc.address_w = WINED3D_TADDRESS_CLAMP; + desc.mag_filter = WINED3D_TEXF_LINEAR; + desc.min_filter = WINED3D_TEXF_LINEAR; + desc.mip_filter = WINED3D_TEXF_LINEAR; + if (FAILED(hr = wined3d_sampler_create(device, &desc, NULL, &device->null_sampler))) { - /* In D3D10+, a NULL sampler maps to the default sampler state. */ - GL_EXTCALL(glGenSamplers(1, &device->null_sampler)); - GL_EXTCALL(glSamplerParameteri(device->null_sampler, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR)); - GL_EXTCALL(glSamplerParameteri(device->null_sampler, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE)); - GL_EXTCALL(glSamplerParameteri(device->null_sampler, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE)); - GL_EXTCALL(glSamplerParameteri(device->null_sampler, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE)); - checkGLcall("Create null sampler"); - } - else - { - device->null_sampler = 0; + ERR("Failed to create null sampler, hr %#x.n", hr); + device->null_sampler = NULL; } } /* Context activation is done by the caller. */ static void destroy_default_samplers(struct wined3d_device *device, struct wined3d_context *context) { - const struct wined3d_gl_info *gl_info = context->gl_info; - wined3d_sampler_decref(device->default_sampler); device->default_sampler = NULL; - - if (gl_info->supported[ARB_SAMPLER_OBJECTS]) - { - GL_EXTCALL(glDeleteSamplers(1, &device->null_sampler)); - checkGLcall("glDeleteSamplers"); - } - - device->null_sampler = 0; + wined3d_sampler_decref(device->null_sampler); + device->null_sampler = NULL; } static LONG fullscreen_style(LONG style) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6b683aa..3b342d8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2689,7 +2689,7 @@ struct wined3d_device /* Default sampler used to emulate the direct resource access without using wined3d_sampler */ struct wined3d_sampler *default_sampler; - GLuint null_sampler; + struct wined3d_sampler *null_sampler; /* Command stream */ struct wined3d_cs *cs;

1 0

← Newer
1
...
31
32
33
34
35
36
37
...
72
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-commits March 2017