February 2017 - Wine-commits

Józef Kucia : wined3d: Load unordered access resources before binding shader resources.
by Alexandre Julliard 22 Feb '17

22 Feb '17

Module: wine Branch: master Commit: cab9282d10e4b2868a0dd85383b1126c0d6c591a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cab9282d10e4b2868a0dd8538… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 22 13:19:26 2017 +0100 wined3d: Load unordered access resources before binding shader resources. Loading a texture might invalidate shader resource view bindings. 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 | 44 ++++++++++++++++++++++++++++++++++---------- 1 file changed, 34 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 93b49a0..a58a905 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3406,16 +3406,13 @@ static void context_bind_shader_resources(struct wined3d_context *context, const } } -static void context_bind_unordered_access_views(struct wined3d_context *context, +static void context_load_unordered_access_resources(struct wined3d_context *context, const struct wined3d_shader *shader, struct wined3d_unordered_access_view * const *views) { - const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_unordered_access_view *view; - struct wined3d_texture *texture = NULL; + struct wined3d_texture *texture; struct wined3d_buffer *buffer; - GLuint texture_name; unsigned int i; - GLint level; context->uses_uavs = 0; @@ -3428,11 +3425,7 @@ static void context_bind_unordered_access_views(struct wined3d_context *context, continue; if (!(view = views[i])) - { - WARN("No unordered access view bound at index %u.\n", i); - GL_EXTCALL(glBindImageTexture(i, 0, 0, GL_FALSE, 0, GL_READ_WRITE, GL_R8)); continue; - } if (view->resource->type == WINED3D_RTYPE_BUFFER) { @@ -3448,14 +3441,41 @@ static void context_bind_unordered_access_views(struct wined3d_context *context, } context->uses_uavs = 1; + } +} + +static void context_bind_unordered_access_views(struct wined3d_context *context, + const struct wined3d_shader *shader, struct wined3d_unordered_access_view * const *views) +{ + const struct wined3d_gl_info *gl_info = context->gl_info; + struct wined3d_unordered_access_view *view; + GLuint texture_name; + unsigned int i; + GLint level; + + if (!shader) + return; + + for (i = 0; i < MAX_UNORDERED_ACCESS_VIEWS; ++i) + { + if (!shader->reg_maps.uav_resource_info[i].type) + continue; + + if (!(view = views[i])) + { + WARN("No unordered access view bound at index %u.\n", i); + GL_EXTCALL(glBindImageTexture(i, 0, 0, GL_FALSE, 0, GL_READ_WRITE, GL_R8)); + continue; + } if (view->gl_view.name) { texture_name = view->gl_view.name; level = 0; } - else if (texture) + else if (view->resource->type != WINED3D_RTYPE_BUFFER) { + struct wined3d_texture *texture = texture_from_resource(view->resource); texture_name = wined3d_texture_get_gl_texture(texture, FALSE)->name; level = view->desc.u.texture.level_idx; } @@ -3496,6 +3516,8 @@ BOOL context_apply_draw_state(struct wined3d_context *context, context_update_tex_unit_map(context, state); context_preload_textures(context, state); context_load_shader_resources(context, state, ~(1u << WINED3D_SHADER_TYPE_COMPUTE)); + context_load_unordered_access_resources(context, state->shader[WINED3D_SHADER_TYPE_PIXEL], + state->unordered_access_view[WINED3D_PIPELINE_GRAPHICS]); /* TODO: Right now the dependency on the vertex shader is necessary * since context_stream_info_from_declaration depends on the reg_maps of * the current VS but maybe it's possible to relax the coupling in some @@ -3579,6 +3601,8 @@ void context_apply_compute_state(struct wined3d_context *context, unsigned int state_id, i, j; context_load_shader_resources(context, state, 1u << WINED3D_SHADER_TYPE_COMPUTE); + context_load_unordered_access_resources(context, state->shader[WINED3D_SHADER_TYPE_COMPUTE], + state->unordered_access_view[WINED3D_PIPELINE_COMPUTE]); for (i = 0, state_id = STATE_COMPUTE_OFFSET; i < ARRAY_SIZE(context->dirty_compute_states); ++i) {

1 0

Józef Kucia : wined3d: Do not try to invalidate compute states for freshly created contexts.
by Alexandre Julliard 22 Feb '17

22 Feb '17

Module: wine Branch: master Commit: f5de7186aa5669982227acde39cc0324fa69e8e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5de7186aa5669982227acde3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 22 13:19:27 2017 +0100 wined3d: Do not try to invalidate compute states for freshly created contexts. The context_invalidate_state() function doesn't handle compute states properly. 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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index a58a905..67daded 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1828,11 +1828,11 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, ret->d3d_info = d3d_info; ret->state_table = device->StateTable; - /* Mark all states dirty to force a proper initialization of the states - * on the first use of the context. */ + /* Mark all states dirty to force a proper initialization of the states on + * the first use of the context. Compute states do not need initialization. */ for (state = 0; state <= STATE_HIGHEST; ++state) { - if (ret->state_table[state].representative) + if (ret->state_table[state].representative && !STATE_IS_COMPUTE(state)) context_invalidate_state(ret, state); }

1 0

Józef Kucia : wined3d: Do not read rev_tex_unit_mapping for texture units >= MAX_COMBINED_SAMPLERS.
by Alexandre Julliard 22 Feb '17

22 Feb '17

Module: wine Branch: master Commit: c808748bcf03379c27e908ff8fae8b28d931de64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c808748bcf03379c27e908ff8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 22 13:19:28 2017 +0100 wined3d: Do not read rev_tex_unit_mapping for texture units >= MAX_COMBINED_SAMPLERS. 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/texture.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 037682d..e05d96a 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -806,8 +806,6 @@ void wined3d_texture_bind(struct wined3d_texture *texture, void wined3d_texture_bind_and_dirtify(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) { - DWORD active_sampler; - /* We don't need a specific texture unit, but after binding the texture * the current unit is dirty. Read the unit back instead of switching to * 0, this avoids messing around with the state manager's GL states. The @@ -817,9 +815,12 @@ void wined3d_texture_bind_and_dirtify(struct wined3d_texture *texture, * called from sampler() in state.c. This means we can't touch anything * other than whatever happens to be the currently active texture, or we * would risk marking already applied sampler states dirty again. */ - active_sampler = context->rev_tex_unit_map[context->active_texture]; - if (active_sampler != WINED3D_UNMAPPED_STAGE) - context_invalidate_state(context, STATE_SAMPLER(active_sampler)); + if (context->active_texture < MAX_COMBINED_SAMPLERS) + { + DWORD active_sampler = context->rev_tex_unit_map[context->active_texture]; + if (active_sampler != WINED3D_UNMAPPED_STAGE) + context_invalidate_state(context, STATE_SAMPLER(active_sampler)); + } /* FIXME: Ideally we'd only do this when touching a binding that's used by * a shader. */ context_invalidate_state(context, STATE_SHADER_RESOURCE_BINDING);

1 0

Józef Kucia : wined3d: Allocate "context-> texture_type" dynamically.
by Alexandre Julliard 22 Feb '17

22 Feb '17

Module: wine Branch: master Commit: 87bf26c34419b412a97d1654dca220fabf057f74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87bf26c34419b412a97d1654d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 22 13:19:29 2017 +0100 wined3d: Allocate "context->texture_type" dynamically. 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 | 5 +++++ dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 67daded..d60248d 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1724,6 +1724,9 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, ret->rev_tex_unit_map[s] = WINED3D_UNMAPPED_STAGE; } } + if (!(ret->texture_type = wined3d_calloc(gl_info->limits.combined_samplers, + sizeof(*ret->texture_type)))) + goto out; if (!(hdc = GetDCEx(swapchain->win_handle, 0, DCX_USESTYLE | DCX_CACHE))) { @@ -2018,6 +2021,7 @@ out: if (hdc) wined3d_release_dc(swapchain->win_handle, hdc); device->shader_backend->shader_free_context_data(ret); device->adapter->fragment_pipe->free_context_data(ret); + HeapFree(GetProcessHeap(), 0, ret->texture_type); HeapFree(GetProcessHeap(), 0, ret->free_event_queries); HeapFree(GetProcessHeap(), 0, ret->free_occlusion_queries); HeapFree(GetProcessHeap(), 0, ret->free_timestamp_queries); @@ -2064,6 +2068,7 @@ void context_destroy(struct wined3d_device *device, struct wined3d_context *cont device->shader_backend->shader_free_context_data(context); device->adapter->fragment_pipe->free_context_data(context); + HeapFree(GetProcessHeap(), 0, context->texture_type); HeapFree(GetProcessHeap(), 0, context->fbo_key); HeapFree(GetProcessHeap(), 0, context->draw_buffers); HeapFree(GetProcessHeap(), 0, context->blit_targets); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 66c1002..c678f73 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1622,7 +1622,7 @@ struct wined3d_context UINT blit_w, blit_h; enum fogsource fog_source; DWORD active_texture; - DWORD texture_type[MAX_COMBINED_SAMPLERS]; + DWORD *texture_type; UINT instance_count;

1 0

Józef Kucia : wined3d: Introduce wined3d_device_set_cs_resource_view().
by Alexandre Julliard 22 Feb '17

22 Feb '17

Module: wine Branch: master Commit: a16a4931b62bf0486db6e0f40a3d4aa992873b76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a16a4931b62bf0486db6e0f40… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 22 13:19:30 2017 +0100 wined3d: Introduce wined3d_device_set_cs_resource_view(). 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/cs.c | 13 ++++++++++--- dlls/wined3d/device.c | 8 ++++++++ dlls/wined3d/state.c | 15 +++++++++++++-- dlls/wined3d/texture.c | 3 ++- dlls/wined3d/utils.c | 6 ++++-- dlls/wined3d/view.c | 6 ++++-- dlls/wined3d/wined3d.spec | 1 + dlls/wined3d/wined3d_private.h | 14 +++++++++----- include/wine/wined3d.h | 2 ++ 9 files changed, 53 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a16a4931b62bf0486db6e…

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_CSSetShaderResources().
by Alexandre Julliard 22 Feb '17

22 Feb '17

Module: wine Branch: master Commit: 7112c290d17f891143ee0af24b24f52d2aff2946 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7112c290d17f891143ee0af24… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 22 13:19:31 2017 +0100 d3d11: Implement d3d11_immediate_context_CSSetShaderResources(). 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/device.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 95b11e6..356f9f0 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1200,8 +1200,21 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DSSetConstantBuffers(ID3D1 static void STDMETHODCALLTYPE d3d11_immediate_context_CSSetShaderResources(ID3D11DeviceContext *iface, UINT start_slot, UINT view_count, ID3D11ShaderResourceView *const *views) { - FIXME("iface %p, start_slot %u, view_count %u, views %p stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, view_count %u, views %p.\n", iface, start_slot, view_count, views); + + wined3d_mutex_lock(); + for (i = 0; i < view_count; ++i) + { + struct d3d_shader_resource_view *view = unsafe_impl_from_ID3D11ShaderResourceView(views[i]); + + wined3d_device_set_cs_resource_view(device->wined3d_device, start_slot + i, + view ? view->wined3d_view : NULL); + } + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_CSSetUnorderedAccessViews(ID3D11DeviceContext *iface,

1 0

Józef Kucia : wined3d: Introduce wined3d_device_set_cs_sampler().
by Alexandre Julliard 22 Feb '17

22 Feb '17

Module: wine Branch: master Commit: c9f080f4a629d888fe939fe6760b900b1a24fe8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9f080f4a629d888fe939fe67… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 22 13:19:32 2017 +0100 wined3d: Introduce wined3d_device_set_cs_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/device.c | 8 ++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 11 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index dea01e6..5a4eb25 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2753,6 +2753,14 @@ void CDECL wined3d_device_set_cs_resource_view(struct wined3d_device *device, wined3d_device_set_shader_resource_view(device, WINED3D_SHADER_TYPE_COMPUTE, idx, view); } +void CDECL wined3d_device_set_cs_sampler(struct wined3d_device *device, + unsigned int idx, struct wined3d_sampler *sampler) +{ + TRACE("device %p, idx %u, sampler %p.\n", device, idx, sampler); + + wined3d_device_set_sampler(device, WINED3D_SHADER_TYPE_COMPUTE, idx, sampler); +} + static void wined3d_device_set_pipeline_unordered_access_view(struct wined3d_device *device, enum wined3d_pipeline pipeline, unsigned int idx, struct wined3d_unordered_access_view *uav) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index a80cec2..875e7e3 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -113,6 +113,7 @@ @ cdecl wined3d_device_set_compute_shader(ptr ptr) @ cdecl wined3d_device_set_cs_cb(ptr long ptr) @ cdecl wined3d_device_set_cs_resource_view(ptr long ptr) +@ cdecl wined3d_device_set_cs_sampler(ptr long ptr) @ cdecl wined3d_device_set_cs_uav(ptr long ptr) @ cdecl wined3d_device_set_cursor_position(ptr long long long) @ cdecl wined3d_device_set_cursor_properties(ptr long long ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 60697b4..03f3db9 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2256,6 +2256,8 @@ void __cdecl wined3d_device_set_compute_shader(struct wined3d_device *device, st void __cdecl wined3d_device_set_cs_cb(struct wined3d_device *device, unsigned int idx, struct wined3d_buffer *buffer); void __cdecl wined3d_device_set_cs_resource_view(struct wined3d_device *device, unsigned int idx, struct wined3d_shader_resource_view *view); +void __cdecl wined3d_device_set_cs_sampler(struct wined3d_device *device, + unsigned int idx, struct wined3d_sampler *sampler); void __cdecl wined3d_device_set_cs_uav(struct wined3d_device *device, unsigned int idx, struct wined3d_unordered_access_view *uav); void __cdecl wined3d_device_set_cursor_position(struct wined3d_device *device,

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_CSSetSamplers().
by Alexandre Julliard 22 Feb '17

22 Feb '17

Module: wine Branch: master Commit: 4c18c1b06620ae7ca48d63312e10c68d0eb71f4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c18c1b06620ae7ca48d63312… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 22 13:19:33 2017 +0100 d3d11: Implement d3d11_immediate_context_CSSetSamplers(). 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/device.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 356f9f0..6269c68 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1260,8 +1260,21 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CSSetShader(ID3D11DeviceCo static void STDMETHODCALLTYPE d3d11_immediate_context_CSSetSamplers(ID3D11DeviceContext *iface, UINT start_slot, UINT sampler_count, ID3D11SamplerState *const *samplers) { - FIXME("iface %p, start_slot %u, sampler_count %u, samplers %p stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, sampler_count %u, samplers %p.\n", iface, start_slot, sampler_count, samplers); + + wined3d_mutex_lock(); + for (i = 0; i < sampler_count; ++i) + { + struct d3d_sampler_state *sampler = unsafe_impl_from_ID3D11SamplerState(samplers[i]); + + wined3d_device_set_cs_sampler(device->wined3d_device, start_slot + i, + sampler ? sampler->wined3d_sampler : NULL); + } + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_CSSetConstantBuffers(ID3D11DeviceContext *iface,

1 0

Józef Kucia : wined3d: Allocate texture binding set for compute pipeline.
by Alexandre Julliard 22 Feb '17

22 Feb '17

Module: wine Branch: master Commit: b3a7d3adaa23a2bf01222afe206c7c8ff797f4fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3a7d3adaa23a2bf01222afe2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 22 13:19:34 2017 +0100 wined3d: Allocate texture binding set for compute pipeline. It seems that a majority of OpenGL implementations allow to statically partition texture bindings. For other implementations we are going to invalidate graphics pipeline texture bindings when appplying compute pipeline texture bindings, and vice versa. 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 | 6 +++--- dlls/wined3d/directx.c | 10 ++++++++++ dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/state.c | 4 +--- dlls/wined3d/wined3d_private.h | 8 +++++--- 5 files changed, 20 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index d60248d..92c2819 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1713,7 +1713,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, /* Initialize the texture unit mapping to a 1:1 mapping */ for (s = 0; s < MAX_COMBINED_SAMPLERS; ++s) { - if (s < gl_info->limits.combined_samplers) + if (s < gl_info->limits.graphics_samplers) { ret->tex_unit_map[s] = s; ret->rev_tex_unit_map[s] = s; @@ -2962,7 +2962,7 @@ static void context_map_vsamplers(struct wined3d_context *context, BOOL ps, cons state->shader[WINED3D_SHADER_TYPE_VERTEX]->reg_maps.resource_info; const struct wined3d_shader_resource_info *ps_resource_info = NULL; const struct wined3d_gl_info *gl_info = context->gl_info; - int start = min(MAX_COMBINED_SAMPLERS, gl_info->limits.combined_samplers) - 1; + int start = min(MAX_COMBINED_SAMPLERS, gl_info->limits.graphics_samplers) - 1; int i; /* Note that we only care if a resource is used or not, not the @@ -3012,7 +3012,7 @@ static void context_update_tex_unit_map(struct wined3d_context *context, const s * When the mapping of a stage is changed, sampler and ALL texture stage * states have to be reset. */ - if (gl_info->limits.combined_samplers >= MAX_COMBINED_SAMPLERS) + if (gl_info->limits.graphics_samplers >= MAX_COMBINED_SAMPLERS) return; if (ps) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8342325..5b1605d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3352,7 +3352,9 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) gl_info->limits.uniform_blocks[i] = 0; gl_info->limits.fragment_samplers = 1; gl_info->limits.vertex_samplers = 0; + gl_info->limits.compute_samplers = 0; gl_info->limits.combined_samplers = gl_info->limits.fragment_samplers + gl_info->limits.vertex_samplers; + gl_info->limits.graphics_samplers = gl_info->limits.combined_samplers; gl_info->limits.vertex_attribs = 16; gl_info->limits.texture_buffer_offset_alignment = 1; gl_info->limits.glsl_vs_float_constants = 0; @@ -3471,6 +3473,7 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) TRACE("Max vertex samplers: %u.\n", gl_info->limits.vertex_samplers); TRACE("Max combined samplers: %u.\n", gl_info->limits.combined_samplers); TRACE("Max vertex attributes: %u.\n", gl_info->limits.vertex_attribs); + gl_info->limits.graphics_samplers = gl_info->limits.combined_samplers; } if (gl_info->supported[ARB_VERTEX_BLEND]) { @@ -3570,6 +3573,13 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) gl_info->limits.uniform_blocks[WINED3D_SHADER_TYPE_COMPUTE] = min(gl_max, WINED3D_MAX_CBS); TRACE("Max compute uniform blocks: %u (%d).\n", gl_info->limits.uniform_blocks[WINED3D_SHADER_TYPE_COMPUTE], gl_max); + gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_COMPUTE_TEXTURE_IMAGE_UNITS, &gl_max); + gl_info->limits.compute_samplers = gl_max; + TRACE("Max compute samplers: %u.\n", gl_info->limits.compute_samplers); + /* A majority of OpenGL implementations allow to statically partition + * the set of texture bindings into six separate sets. */ + if (gl_info->limits.combined_samplers >= MAX_COMBINED_SAMPLERS + gl_info->limits.compute_samplers) + gl_info->limits.graphics_samplers -= gl_info->limits.compute_samplers; } if (gl_info->supported[ARB_UNIFORM_BUFFER_OBJECT]) { diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 41adac1..a8f7f86 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -592,7 +592,7 @@ static void shader_glsl_load_samplers(const struct wined3d_gl_info *gl_info, continue; mapped_unit = tex_unit_map[sampler_info[i].base_idx + j]; - if (mapped_unit == WINED3D_UNMAPPED_STAGE || mapped_unit >= gl_info->limits.combined_samplers) + if (mapped_unit == WINED3D_UNMAPPED_STAGE || mapped_unit >= gl_info->limits.graphics_samplers) { ERR("Trying to load sampler %s on unsupported unit %u.\n", sampler_name->buffer, mapped_unit); continue; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index ff79c7a..b73f4a8 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3604,10 +3604,8 @@ static void sampler(struct wined3d_context *context, const struct wined3d_state return; } - if (mapped_stage >= gl_info->limits.combined_samplers) - { + if (mapped_stage >= gl_info->limits.graphics_samplers) return; - } context_active_texture(context, gl_info, mapped_stage); if (state->textures[sampler_idx]) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a74ea77..8217cb6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2202,9 +2202,11 @@ struct wined3d_gl_limits UINT textures; UINT texture_coords; unsigned int uniform_blocks[WINED3D_SHADER_TYPE_COUNT]; - UINT fragment_samplers; - UINT vertex_samplers; - UINT combined_samplers; + unsigned int fragment_samplers; + unsigned int vertex_samplers; + unsigned int compute_samplers; + unsigned int graphics_samplers; + unsigned int combined_samplers; UINT general_combiners; UINT user_clip_distances; UINT texture_size;

1 0

Henri Verbeet : wined3d: Return a BOOL from surface_load_location().
by Alexandre Julliard 22 Feb '17

22 Feb '17

Module: wine Branch: master Commit: 8de7e5ccef4f102982494bb0b70373dca74a4192 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8de7e5ccef4f102982494bb0b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 22 00:53:19 2017 +0100 wined3d: Return a BOOL from surface_load_location(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 23 ++++++++--------------- dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 10 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b30585c..96819a6 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2747,11 +2747,10 @@ static void surface_load_renderbuffer(struct wined3d_surface *surface, struct wi } /* Context activation is done by the caller. Context may be NULL in ddraw-only mode. */ -HRESULT surface_load_location(struct wined3d_surface *surface, struct wined3d_context *context, DWORD location) +BOOL surface_load_location(struct wined3d_surface *surface, struct wined3d_context *context, DWORD location) { unsigned int sub_resource_idx = surface_get_sub_resource_idx(surface); struct wined3d_texture *texture = surface->container; - HRESULT hr; TRACE("surface %p, location %s.\n", surface, wined3d_debug_location(location)); @@ -2760,7 +2759,7 @@ HRESULT surface_load_location(struct wined3d_surface *surface, struct wined3d_co DWORD current = texture->sub_resources[sub_resource_idx].locations; FIXME("Unimplemented copy from %s to %s for depth/stencil buffers.\n", wined3d_debug_location(current), wined3d_debug_location(location)); - return WINED3DERR_INVALIDCALL; + return FALSE; } switch (location) @@ -2769,31 +2768,25 @@ HRESULT surface_load_location(struct wined3d_surface *surface, struct wined3d_co case WINED3D_LOCATION_SYSMEM: case WINED3D_LOCATION_BUFFER: surface_load_sysmem(surface, context, location); - break; + return TRUE; case WINED3D_LOCATION_DRAWABLE: - if (FAILED(hr = surface_load_drawable(surface, context))) - return hr; - break; + return SUCCEEDED(surface_load_drawable(surface, context)); case WINED3D_LOCATION_RB_RESOLVED: case WINED3D_LOCATION_RB_MULTISAMPLE: surface_load_renderbuffer(surface, context, location); - break; + return TRUE; case WINED3D_LOCATION_TEXTURE_RGB: case WINED3D_LOCATION_TEXTURE_SRGB: - if (FAILED(hr = surface_load_texture(surface, context, - location == WINED3D_LOCATION_TEXTURE_SRGB))) - return hr; - break; + return SUCCEEDED(surface_load_texture(surface, context, + location == WINED3D_LOCATION_TEXTURE_SRGB)); default: ERR("Don't know how to handle location %#x.\n", location); - break; + return FALSE; } - - return WINED3D_OK; } static HRESULT ffp_blit_alloc(struct wined3d_device *device) { return WINED3D_OK; } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index d86e7ec..037682d 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1574,7 +1574,7 @@ static void texture2d_upload_data(struct wined3d_texture *texture, unsigned int static BOOL texture2d_load_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location) { - return SUCCEEDED(surface_load_location(texture->sub_resources[sub_resource_idx].u.surface, context, location)); + return surface_load_location(texture->sub_resources[sub_resource_idx].u.surface, context, location); } /* Context activation is done by the caller. */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fd03674..66c1002 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3024,7 +3024,7 @@ HRESULT wined3d_surface_create_dc(struct wined3d_surface *surface) DECLSPEC_HIDD void wined3d_surface_destroy_dc(struct wined3d_surface *surface) DECLSPEC_HIDDEN; void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb, struct wined3d_context *context) DECLSPEC_HIDDEN; -HRESULT surface_load_location(struct wined3d_surface *surface, +BOOL surface_load_location(struct wined3d_surface *surface, struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; void surface_set_compatible_renderbuffer(struct wined3d_surface *surface, const struct wined3d_surface *rt) DECLSPEC_HIDDEN;

1 0