February 2017 - Wine-Commits

Francois Gouget : oledb32: Add __WINE_ALLOC_SIZE attributes to heap_xxx() functions.
by Alexandre Julliard Feb. 22, 2017

Feb. 22, 2017

Module: wine Branch: master Commit: 87f21b12b31fc03d7593c11ae6de52ee995b73e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87f21b12b31fc03d7593c11ae… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 22 11:26:30 2017 +0100 oledb32: Add __WINE_ALLOC_SIZE attributes to heap_xxx() functions. And standardize their parameter names. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/oledb_private.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/oledb32/oledb_private.h b/dlls/oledb32/oledb_private.h index 0b71a81..6f2bf76 100644 --- a/dlls/oledb32/oledb_private.h +++ b/dlls/oledb32/oledb_private.h @@ -26,24 +26,24 @@ HRESULT create_dslocator(IUnknown *outer, void **obj) DECLSPEC_HIDDEN; HRESULT get_data_source(IUnknown *outer, DWORD clsctx, LPWSTR initstring, REFIID riid, IUnknown **datasource) DECLSPEC_HIDDEN; -static inline void *heap_alloc(size_t len) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) { - return HeapAlloc(GetProcessHeap(), 0, len); + return HeapAlloc(GetProcessHeap(), 0, size); } -static inline void *heap_alloc_zero(size_t len) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) { - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); } -static inline void *heap_realloc(void *mem, size_t len) +static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) { - return HeapReAlloc(GetProcessHeap(), 0, mem, len); + return HeapReAlloc(GetProcessHeap(), 0, mem, size); } -static inline void *heap_realloc_zero(void *mem, size_t len) +static inline void* __WINE_ALLOC_SIZE(2) heap_realloc_zero(void *mem, size_t size) { - return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, len); + return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, size); } static inline BOOL heap_free(void *mem)

1 0

Francois Gouget : wbemdisp: Simplify and standardize the heap_xxx() declarations.
by Alexandre Julliard Feb. 22, 2017

Feb. 22, 2017

Module: wine Branch: master Commit: 64be3a2fe06a8d249de78c56e36118d4d36afab3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64be3a2fe06a8d249de78c56e… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 22 11:25:18 2017 +0100 wbemdisp: Simplify and standardize the heap_xxx() declarations. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemdisp/wbemdisp_private.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/wbemdisp/wbemdisp_private.h b/dlls/wbemdisp/wbemdisp_private.h index cc84d72..2891248 100644 --- a/dlls/wbemdisp/wbemdisp_private.h +++ b/dlls/wbemdisp/wbemdisp_private.h @@ -18,13 +18,12 @@ HRESULT SWbemLocator_create(LPVOID *) DECLSPEC_HIDDEN; -static void *heap_alloc( size_t len ) __WINE_ALLOC_SIZE(1); -static inline void *heap_alloc( size_t len ) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) { - return HeapAlloc( GetProcessHeap(), 0, len ); + return HeapAlloc(GetProcessHeap(), 0, size); } -static inline BOOL heap_free( void *mem ) +static inline BOOL heap_free(void *mem) { - return HeapFree( GetProcessHeap(), 0, mem ); + return HeapFree(GetProcessHeap(), 0, mem); }

1 0

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

Feb. 22, 2017

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

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

Feb. 22, 2017

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 : wined3d: Allocate "context-> texture_type" dynamically.
by Alexandre Julliard Feb. 22, 2017

Feb. 22, 2017

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: Load unordered access resources before binding shader resources.
by Alexandre Julliard Feb. 22, 2017

Feb. 22, 2017

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

Francois Gouget : pdh: Add __WINE_ALLOC_SIZE attributes to heap_xxx() functions.
by Alexandre Julliard Feb. 22, 2017

Feb. 22, 2017

Module: wine Branch: master Commit: 88c4d3361cf179f39b936a7dd61f7d268d45b02e URL: http://source.winehq.org/git/wine.git/?a=commit;h=88c4d3361cf179f39b936a7dd… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 22 11:25:56 2017 +0100 pdh: Add __WINE_ALLOC_SIZE attributes to heap_xxx() functions. And standardize their formatting and type names. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/pdh/pdh_main.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index 39f9f25..0d7c5ef 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -47,19 +47,19 @@ static CRITICAL_SECTION_DEBUG pdh_handle_cs_debug = }; static CRITICAL_SECTION pdh_handle_cs = { &pdh_handle_cs_debug, -1, 0, 0, 0, 0 }; -static inline void *heap_alloc( SIZE_T size ) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) { - return HeapAlloc( GetProcessHeap(), 0, size ); + return HeapAlloc(GetProcessHeap(), 0, size); } -static inline void *heap_alloc_zero( SIZE_T size ) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) { - return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, size ); + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); } -static inline void heap_free( LPVOID mem ) +static inline BOOL heap_free(void *mem) { - HeapFree( GetProcessHeap(), 0, mem ); + return HeapFree(GetProcessHeap(), 0, mem); } static inline WCHAR *pdh_strdup( const WCHAR *src )

1 0

Henri Verbeet : wined3d: Support depth formats in wined3d_format_convert_from_float().
by Alexandre Julliard Feb. 22, 2017

Feb. 22, 2017

Module: wine Branch: master Commit: 0f304806b3e0e8b2c84a367266a56eeb980d9ac7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f304806b3e0e8b2c84a36726… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 22 00:53:23 2017 +0100 wined3d: Support depth formats in wined3d_format_convert_from_float(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 9041c53..d236847 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4930,22 +4930,27 @@ DWORD wined3d_format_convert_from_float(const struct wined3d_format *format, con } conv[] = { - {WINED3DFMT_B8G8R8A8_UNORM, 255.0f, 255.0f, 255.0f, 255.0f, 16, 8, 0, 24}, - {WINED3DFMT_B8G8R8X8_UNORM, 255.0f, 255.0f, 255.0f, 255.0f, 16, 8, 0, 24}, - {WINED3DFMT_B8G8R8_UNORM, 255.0f, 255.0f, 255.0f, 255.0f, 16, 8, 0, 24}, - {WINED3DFMT_B5G6R5_UNORM, 31.0f, 63.0f, 31.0f, 0.0f, 11, 5, 0, 0}, - {WINED3DFMT_B5G5R5A1_UNORM, 31.0f, 31.0f, 31.0f, 1.0f, 10, 5, 0, 15}, - {WINED3DFMT_B5G5R5X1_UNORM, 31.0f, 31.0f, 31.0f, 1.0f, 10, 5, 0, 15}, - {WINED3DFMT_R8_UNORM, 255.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0}, - {WINED3DFMT_A8_UNORM, 0.0f, 0.0f, 0.0f, 255.0f, 0, 0, 0, 0}, - {WINED3DFMT_B4G4R4A4_UNORM, 15.0f, 15.0f, 15.0f, 15.0f, 8, 4, 0, 12}, - {WINED3DFMT_B4G4R4X4_UNORM, 15.0f, 15.0f, 15.0f, 15.0f, 8, 4, 0, 12}, - {WINED3DFMT_B2G3R3_UNORM, 7.0f, 7.0f, 3.0f, 0.0f, 5, 2, 0, 0}, - {WINED3DFMT_R8G8B8A8_UNORM, 255.0f, 255.0f, 255.0f, 255.0f, 0, 8, 16, 24}, - {WINED3DFMT_R8G8B8X8_UNORM, 255.0f, 255.0f, 255.0f, 255.0f, 0, 8, 16, 24}, - {WINED3DFMT_B10G10R10A2_UNORM, 1023.0f, 1023.0f, 1023.0f, 3.0f, 20, 10, 0, 30}, - {WINED3DFMT_R10G10B10A2_UNORM, 1023.0f, 1023.0f, 1023.0f, 3.0f, 0, 10, 20, 30}, - {WINED3DFMT_P8_UINT, 0.0f, 0.0f, 0.0f, 255.0f, 0, 0, 0, 0}, + {WINED3DFMT_B8G8R8A8_UNORM, 255.0f, 255.0f, 255.0f, 255.0f, 16, 8, 0, 24}, + {WINED3DFMT_B8G8R8X8_UNORM, 255.0f, 255.0f, 255.0f, 255.0f, 16, 8, 0, 24}, + {WINED3DFMT_B8G8R8_UNORM, 255.0f, 255.0f, 255.0f, 255.0f, 16, 8, 0, 24}, + {WINED3DFMT_B5G6R5_UNORM, 31.0f, 63.0f, 31.0f, 0.0f, 11, 5, 0, 0}, + {WINED3DFMT_B5G5R5A1_UNORM, 31.0f, 31.0f, 31.0f, 1.0f, 10, 5, 0, 15}, + {WINED3DFMT_B5G5R5X1_UNORM, 31.0f, 31.0f, 31.0f, 1.0f, 10, 5, 0, 15}, + {WINED3DFMT_R8_UNORM, 255.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0}, + {WINED3DFMT_A8_UNORM, 0.0f, 0.0f, 0.0f, 255.0f, 0, 0, 0, 0}, + {WINED3DFMT_B4G4R4A4_UNORM, 15.0f, 15.0f, 15.0f, 15.0f, 8, 4, 0, 12}, + {WINED3DFMT_B4G4R4X4_UNORM, 15.0f, 15.0f, 15.0f, 15.0f, 8, 4, 0, 12}, + {WINED3DFMT_B2G3R3_UNORM, 7.0f, 7.0f, 3.0f, 0.0f, 5, 2, 0, 0}, + {WINED3DFMT_R8G8B8A8_UNORM, 255.0f, 255.0f, 255.0f, 255.0f, 0, 8, 16, 24}, + {WINED3DFMT_R8G8B8X8_UNORM, 255.0f, 255.0f, 255.0f, 255.0f, 0, 8, 16, 24}, + {WINED3DFMT_B10G10R10A2_UNORM, 1023.0f, 1023.0f, 1023.0f, 3.0f, 20, 10, 0, 30}, + {WINED3DFMT_R10G10B10A2_UNORM, 1023.0f, 1023.0f, 1023.0f, 3.0f, 0, 10, 20, 30}, + {WINED3DFMT_P8_UINT, 0.0f, 0.0f, 0.0f, 255.0f, 0, 0, 0, 0}, + {WINED3DFMT_S1_UINT_D15_UNORM, 32767.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0}, + {WINED3DFMT_D16_UNORM, 65535.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0}, + {WINED3DFMT_D24_UNORM_S8_UINT, 16777215.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0}, + {WINED3DFMT_X8D24_UNORM, 16777215.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0}, + {WINED3DFMT_D32_UNORM, 4294967295.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0}, }; unsigned int i;

1 0

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

Feb. 22, 2017

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 : wined3d: Do not read rev_tex_unit_mapping for texture units >= MAX_COMBINED_SAMPLERS.
by Alexandre Julliard Feb. 22, 2017

Feb. 22, 2017

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