wine-commits August 2019

wine-commits@winehq.org

2 participants
703 discussions

Henri Verbeet : wined3d: Create the default samplers in adapter_vk_init_3d ().
by Alexandre Julliard 19 Aug '19

19 Aug '19

Module: wine Branch: master Commit: 591adce8c1933e8092fc75d429a02b4cdea4b36b URL: https://source.winehq.org/git/wine.git/?a=commit;h=591adce8c1933e8092fc75d4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 19 16:42:31 2019 +0430 wined3d: Create the default samplers in adapter_vk_init_3d(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 7 ++++++- dlls/wined3d/device.c | 8 ++++---- dlls/wined3d/wined3d_private.h | 4 ++++ 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 5261fd3..2e72269 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -443,6 +443,8 @@ static HRESULT adapter_vk_init_3d(struct wined3d_device *device) return E_FAIL; } + wined3d_device_create_default_samplers(device, &context_vk->c); + return WINED3D_OK; } @@ -453,14 +455,17 @@ static void adapter_vk_uninit_3d(struct wined3d_device *device) TRACE("device %p.\n", device); + context_vk = &wined3d_device_vk(device)->context_vk; + LIST_FOR_EACH_ENTRY(shader, &device->shaders, struct wined3d_shader, shader_list_entry) { device->shader_backend->shader_destroy(shader); } + wined3d_device_destroy_default_samplers(device, &context_vk->c); + device->blitter->ops->blitter_destroy(device->blitter, NULL); - context_vk = &wined3d_device_vk(device)->context_vk; device_context_remove(device, &context_vk->c); device->shader_backend->shader_free_private(device, NULL); wined3d_context_vk_cleanup(context_vk); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7f1a98f..92259e3 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -840,7 +840,7 @@ static void wined3d_device_gl_destroy_dummy_textures(struct wined3d_device_gl *d } /* Context activation is done by the caller. */ -static void create_default_samplers(struct wined3d_device *device, struct wined3d_context *context) +void wined3d_device_create_default_samplers(struct wined3d_device *device, struct wined3d_context *context) { struct wined3d_sampler_desc desc; HRESULT hr; @@ -888,7 +888,7 @@ static void create_default_samplers(struct wined3d_device *device, struct wined3 } /* Context activation is done by the caller. */ -static void destroy_default_samplers(struct wined3d_device *device, struct wined3d_context *context) +void wined3d_device_destroy_default_samplers(struct wined3d_device *device, struct wined3d_context *context) { wined3d_sampler_decref(device->default_sampler); device->default_sampler = NULL; @@ -973,7 +973,7 @@ void wined3d_device_delete_opengl_contexts_cs(void *object) device->blitter->ops->blitter_destroy(device->blitter, context); device->shader_backend->shader_free_private(device, context); wined3d_device_gl_destroy_dummy_textures(device_gl, context_gl); - destroy_default_samplers(device, context); + wined3d_device_destroy_default_samplers(device, context); context_release(context); while (device->context_count) @@ -1025,7 +1025,7 @@ void wined3d_device_create_primary_opengl_context_cs(void *object) context_gl = wined3d_context_gl(context); wined3d_device_gl_create_dummy_textures(wined3d_device_gl(device), context_gl); - create_default_samplers(device, context); + wined3d_device_create_default_samplers(device, context); context_release(context); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e5d52ea..26a1fee 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3309,8 +3309,12 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c const struct wined3d_color *color, float depth, DWORD stencil) DECLSPEC_HIDDEN; BOOL device_context_add(struct wined3d_device *device, struct wined3d_context *context) DECLSPEC_HIDDEN; void device_context_remove(struct wined3d_device *device, struct wined3d_context *context) DECLSPEC_HIDDEN; +void wined3d_device_create_default_samplers(struct wined3d_device *device, + struct wined3d_context *context) DECLSPEC_HIDDEN; void wined3d_device_create_primary_opengl_context_cs(void *object) DECLSPEC_HIDDEN; void wined3d_device_delete_opengl_contexts_cs(void *object) DECLSPEC_HIDDEN; +void wined3d_device_destroy_default_samplers(struct wined3d_device *device, + struct wined3d_context *context) DECLSPEC_HIDDEN; HRESULT wined3d_device_init(struct wined3d_device *device, struct wined3d *wined3d, unsigned int adapter_idx, enum wined3d_device_type device_type, HWND focus_window, unsigned int flags, BYTE surface_alignment, const enum wined3d_feature_level *levels, unsigned int level_count,

1 0

Henri Verbeet : wined3d: Add support for sRGB formats to wined3d_format_convert_from_float().
by Alexandre Julliard 19 Aug '19

19 Aug '19

Module: wine Branch: master Commit: 7ac8b0f9a705a3022c1ac93e912453c04ebe5ac3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ac8b0f9a705a3022c1ac93e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 19 16:42:30 2019 +0430 wined3d: Add support for sRGB formats to 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 | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index cf7c177..e10d617 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -5750,14 +5750,27 @@ DWORD wined3d_format_convert_from_float(const struct wined3d_format *format, con {WINED3DFMT_X8D24_UNORM, { 16777215.0, 0.0, 0.0, 0.0}, {0, 0, 0, 0}}, {WINED3DFMT_D32_UNORM, {4294967295.0, 0.0, 0.0, 0.0}, {0, 0, 0, 0}}, }; + enum wined3d_format_id format_id = format->id; + struct wined3d_color colour_srgb; unsigned int i; DWORD ret; - TRACE("Converting color %s to format %s.\n", debug_color(color), debug_d3dformat(format->id)); + TRACE("Converting colour %s to format %s.\n", debug_color(color), debug_d3dformat(format_id)); + + for (i = 0; i < ARRAY_SIZE(format_srgb_info); ++i) + { + if (format_id != format_srgb_info[i].srgb_format_id) + continue; + + wined3d_colour_srgb_from_linear(&colour_srgb, color); + format_id = format_srgb_info[i].base_format_id; + color = &colour_srgb; + break; + } for (i = 0; i < ARRAY_SIZE(float_conv); ++i) { - if (format->id != float_conv[i].format_id) + if (format_id != float_conv[i].format_id) continue; ret = ((DWORD)((color->r * float_conv[i].mul.x) + 0.5f)) << float_conv[i].shift.x; @@ -5772,7 +5785,7 @@ DWORD wined3d_format_convert_from_float(const struct wined3d_format *format, con for (i = 0; i < ARRAY_SIZE(double_conv); ++i) { - if (format->id != double_conv[i].format_id) + if (format_id != double_conv[i].format_id) continue; ret = ((DWORD)((color->r * double_conv[i].mul.x) + 0.5)) << double_conv[i].shift.x; @@ -5785,7 +5798,7 @@ DWORD wined3d_format_convert_from_float(const struct wined3d_format *format, con return ret; } - FIXME("Conversion for format %s not implemented.\n", debug_d3dformat(format->id)); + FIXME("Conversion for format %s not implemented.\n", debug_d3dformat(format_id)); return 0; }

1 0

Henri Verbeet : wined3d: Store the sRGB constants as wined3d_vec4 structures.
by Alexandre Julliard 19 Aug '19

19 Aug '19

Module: wine Branch: master Commit: 000eab872733b9e5145afab4d65339d2d8d68b43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=000eab872733b9e5145afab4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 19 16:42:29 2019 +0430 wined3d: Store the sRGB constants as wined3d_vec4 structures. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 8 ++++---- dlls/wined3d/glsl_shader.c | 8 ++++---- dlls/wined3d/shader.c | 11 +++++++---- dlls/wined3d/wined3d_private.h | 9 ++++----- 4 files changed, 19 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 9502430..34c3f06 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -3668,10 +3668,10 @@ static GLuint shader_arb_generate_pshader(const struct wined3d_shader *shader, if (args->super.srgb_correction) { shader_addline(buffer, "PARAM srgb_consts0 = "); - shader_arb_append_imm_vec4(buffer, wined3d_srgb_const0); + shader_arb_append_imm_vec4(buffer, &wined3d_srgb_const[0].x); shader_addline(buffer, ";\n"); shader_addline(buffer, "PARAM srgb_consts1 = "); - shader_arb_append_imm_vec4(buffer, wined3d_srgb_const1); + shader_arb_append_imm_vec4(buffer, &wined3d_srgb_const[1].x); shader_addline(buffer, ";\n"); } @@ -6371,10 +6371,10 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, con if (settings->sRGB_write) { shader_addline(&buffer, "PARAM srgb_consts0 = "); - shader_arb_append_imm_vec4(&buffer, wined3d_srgb_const0); + shader_arb_append_imm_vec4(&buffer, &wined3d_srgb_const[0].x); shader_addline(&buffer, ";\n"); shader_addline(&buffer, "PARAM srgb_consts1 = "); - shader_arb_append_imm_vec4(&buffer, wined3d_srgb_const1); + shader_arb_append_imm_vec4(&buffer, &wined3d_srgb_const[1].x); shader_addline(&buffer, ";\n"); } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0f1a319..76c3f9f 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7701,10 +7701,10 @@ static GLuint shader_glsl_generate_fragment_shader(const struct wined3d_context_ if (args->srgb_correction) { shader_addline(buffer, "const vec4 srgb_const0 = "); - shader_glsl_append_imm_vec(buffer, wined3d_srgb_const0, 4, gl_info); + shader_glsl_append_imm_vec(buffer, &wined3d_srgb_const[0].x, 4, gl_info); shader_addline(buffer, ";\n"); shader_addline(buffer, "const vec4 srgb_const1 = "); - shader_glsl_append_imm_vec(buffer, wined3d_srgb_const1, 4, gl_info); + shader_glsl_append_imm_vec(buffer, &wined3d_srgb_const[1].x, 4, gl_info); shader_addline(buffer, ";\n"); } if (reg_maps->vpos || reg_maps->usesdsy) @@ -9555,10 +9555,10 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * if (settings->sRGB_write) { shader_addline(buffer, "const vec4 srgb_const0 = "); - shader_glsl_append_imm_vec(buffer, wined3d_srgb_const0, 4, gl_info); + shader_glsl_append_imm_vec(buffer, &wined3d_srgb_const[0].x, 4, gl_info); shader_addline(buffer, ";\n"); shader_addline(buffer, "const vec4 srgb_const1 = "); - shader_glsl_append_imm_vec(buffer, wined3d_srgb_const1, 4, gl_info); + shader_glsl_append_imm_vec(buffer, &wined3d_srgb_const[1].x, 4, gl_info); shader_addline(buffer, ";\n"); } diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 4961dca..3b9a96a 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -32,10 +32,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); -/* pow, mul_high, sub_high, mul_low */ -const float wined3d_srgb_const0[] = {0.41666f, 1.055f, 0.055f, 12.92f}; -/* cmp */ -const float wined3d_srgb_const1[] = {0.0031308f, 0.0f, 0.0f, 0.0f}; +const struct wined3d_vec4 wined3d_srgb_const[] = +{ + /* pow, mul_high, sub_high, mul_low */ + {0.41666f, 1.055f, 0.055f, 12.92f}, + /* cmp */ + {0.0031308f, 0.0f, 0.0f, 0.0f}, +}; static const char * const shader_opcode_names[] = { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 68250f0..e5d52ea 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1482,17 +1482,16 @@ static inline void wined3d_color_from_d3dcolor(struct wined3d_color *wined3d_col wined3d_color->a = D3DCOLOR_B_A(d3d_color) / 255.0f; } -extern const float wined3d_srgb_const0[] DECLSPEC_HIDDEN; -extern const float wined3d_srgb_const1[] DECLSPEC_HIDDEN; +extern const struct wined3d_vec4 wined3d_srgb_const[] DECLSPEC_HIDDEN; static inline float wined3d_srgb_from_linear(float colour) { if (colour < 0.0f) return 0.0f; - if (colour < wined3d_srgb_const1[0]) - return colour * wined3d_srgb_const0[3]; + if (colour < wined3d_srgb_const[1].x) + return colour * wined3d_srgb_const[0].w; if (colour < 1.0f) - return wined3d_srgb_const0[1] * powf(colour, wined3d_srgb_const0[0]) - wined3d_srgb_const0[2]; + return wined3d_srgb_const[0].y * powf(colour, wined3d_srgb_const[0].x) - wined3d_srgb_const[0].z; return 1.0f; }

1 0

Henri Verbeet : wined3d: Introduce wined3d_colour_srgb_from_linear().
by Alexandre Julliard 19 Aug '19

19 Aug '19

Module: wine Branch: master Commit: f193979a185be943dd2f5a966803c09a1c4e67b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f193979a185be943dd2f5a96… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 19 16:42:28 2019 +0430 wined3d: Introduce wined3d_colour_srgb_from_linear(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 22 ++++------------------ dlls/wined3d/wined3d_private.h | 26 +++++++++++++++++++++++--- 2 files changed, 27 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 81a6d3a..7f1a98f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -291,7 +291,7 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c struct wined3d_context_gl *context_gl; struct wined3d_texture *target = NULL; UINT drawable_width, drawable_height; - struct wined3d_color corrected_color; + struct wined3d_color colour_srgb; struct wined3d_context *context; GLbitfield clear_mask = 0; BOOL render_offscreen; @@ -430,25 +430,11 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c if (!gl_info->supported[ARB_FRAMEBUFFER_SRGB] && needs_srgb_write(context, state, fb)) { if (rt_count > 1) - WARN("Clearing multiple sRGB render targets with no GL_ARB_framebuffer_sRGB " + WARN("Clearing multiple sRGB render targets without GL_ARB_framebuffer_sRGB " "support, this might cause graphical issues.\n"); - corrected_color.r = color->r < wined3d_srgb_const1[0] - ? color->r * wined3d_srgb_const0[3] - : pow(color->r, wined3d_srgb_const0[0]) * wined3d_srgb_const0[1] - - wined3d_srgb_const0[2]; - corrected_color.r = min(max(corrected_color.r, 0.0f), 1.0f); - corrected_color.g = color->g < wined3d_srgb_const1[0] - ? color->g * wined3d_srgb_const0[3] - : pow(color->g, wined3d_srgb_const0[0]) * wined3d_srgb_const0[1] - - wined3d_srgb_const0[2]; - corrected_color.g = min(max(corrected_color.g, 0.0f), 1.0f); - corrected_color.b = color->b < wined3d_srgb_const1[0] - ? color->b * wined3d_srgb_const0[3] - : pow(color->b, wined3d_srgb_const0[0]) * wined3d_srgb_const0[1] - - wined3d_srgb_const0[2]; - corrected_color.b = min(max(corrected_color.b, 0.0f), 1.0f); - color = &corrected_color; + wined3d_colour_srgb_from_linear(&colour_srgb, color); + color = &colour_srgb; } gl_info->gl_ops.gl.p_glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 71e4d71..68250f0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1482,6 +1482,29 @@ static inline void wined3d_color_from_d3dcolor(struct wined3d_color *wined3d_col wined3d_color->a = D3DCOLOR_B_A(d3d_color) / 255.0f; } +extern const float wined3d_srgb_const0[] DECLSPEC_HIDDEN; +extern const float wined3d_srgb_const1[] DECLSPEC_HIDDEN; + +static inline float wined3d_srgb_from_linear(float colour) +{ + if (colour < 0.0f) + return 0.0f; + if (colour < wined3d_srgb_const1[0]) + return colour * wined3d_srgb_const0[3]; + if (colour < 1.0f) + return wined3d_srgb_const0[1] * powf(colour, wined3d_srgb_const0[0]) - wined3d_srgb_const0[2]; + return 1.0f; +} + +static inline void wined3d_colour_srgb_from_linear(struct wined3d_color *colour_srgb, + const struct wined3d_color *colour) +{ + colour_srgb->r = wined3d_srgb_from_linear(colour->r); + colour_srgb->g = wined3d_srgb_from_linear(colour->g); + colour_srgb->b = wined3d_srgb_from_linear(colour->b); + colour_srgb->a = colour->a; +} + #define WINED3D_HIGHEST_TRANSFORM_STATE WINED3D_TS_WORLD_MATRIX(255) /* Highest value in wined3d_transform_state. */ void wined3d_check_gl_call(const struct wined3d_gl_info *gl_info, @@ -2978,9 +3001,6 @@ const struct ffp_frag_desc *find_ffp_frag_shader(const struct wine_rb_tree *frag void add_ffp_frag_shader(struct wine_rb_tree *shaders, struct ffp_frag_desc *desc) DECLSPEC_HIDDEN; void wined3d_ftoa(float value, char *s) DECLSPEC_HIDDEN; -extern const float wined3d_srgb_const0[] DECLSPEC_HIDDEN; -extern const float wined3d_srgb_const1[] DECLSPEC_HIDDEN; - enum wined3d_ffp_vs_fog_mode { WINED3D_FFP_VS_FOG_OFF = 0,

1 0

Henri Verbeet : wined3d: Introduce WINED3D_TEXTURE_DOWNLOADABLE.
by Alexandre Julliard 19 Aug '19

19 Aug '19

Module: wine Branch: master Commit: af8401ba0c44a6c3dfcec2d6251bee1c33f61bb9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af8401ba0c44a6c3dfcec2d6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 19 16:42:27 2019 +0430 wined3d: Introduce WINED3D_TEXTURE_DOWNLOADABLE. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 5 ++--- dlls/wined3d/texture.c | 12 +++++++++++- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a43f0f2..d254e90 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2522,9 +2522,8 @@ HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_ TRACE("Not doing download because of format conversion.\n"); else if (src_texture->resource.format->conv_byte_count) TRACE("Not doing download because the source format needs conversion.\n"); - else if (wined3d_texture_gl_is_multisample_location(wined3d_texture_gl(src_texture), - WINED3D_LOCATION_TEXTURE_RGB)) - TRACE("Not doing download because of multisample source.\n"); + else if (!(src_texture->flags & WINED3D_TEXTURE_DOWNLOADABLE)) + TRACE("Not doing download because texture is not downloadable.\n"); else if (!texture2d_is_full_rect(src_texture, src_sub_resource_idx % src_texture->level_count, &src_rect)) TRACE("Not doing download because of partial download (src).\n"); else if (!texture2d_is_full_rect(dst_texture, dst_sub_resource_idx % dst_texture->level_count, &dst_rect)) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 1f9e581..380aff5 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1602,9 +1602,15 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT if (texture->texture_ops == &texture_gl_ops) { if (multisample_type && gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) + { wined3d_texture_gl(texture)->target = GL_TEXTURE_2D_MULTISAMPLE; + texture->flags &= ~WINED3D_TEXTURE_DOWNLOADABLE; + } else + { wined3d_texture_gl(texture)->target = GL_TEXTURE_2D; + texture->flags |= WINED3D_TEXTURE_DOWNLOADABLE; + } } if (((width & (width - 1)) || (height & (height - 1))) && !d3d_info->texture_npot @@ -3223,7 +3229,8 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc texture->layer_count = layer_count; texture->level_count = level_count; texture->lod = 0; - texture->flags |= WINED3D_TEXTURE_POW2_MAT_IDENT | WINED3D_TEXTURE_NORMALIZED_COORDS; + texture->flags |= WINED3D_TEXTURE_POW2_MAT_IDENT | WINED3D_TEXTURE_NORMALIZED_COORDS + | WINED3D_TEXTURE_DOWNLOADABLE; if (flags & WINED3D_TEXTURE_CREATE_GET_DC_LENIENT) texture->flags |= WINED3D_TEXTURE_PIN_SYSMEM | WINED3D_TEXTURE_GET_DC_LENIENT; if (flags & (WINED3D_TEXTURE_CREATE_GET_DC | WINED3D_TEXTURE_CREATE_GET_DC_LENIENT)) @@ -3658,6 +3665,9 @@ HRESULT wined3d_texture_gl_init(struct wined3d_texture_gl *texture_gl, struct wi if (texture_gl->t.resource.gl_type == WINED3D_GL_RES_TYPE_TEX_RECT) texture_gl->target = GL_TEXTURE_RECTANGLE_ARB; + if (texture_gl->target == GL_TEXTURE_2D_MULTISAMPLE_ARRAY || texture_gl->target == GL_TEXTURE_2D_MULTISAMPLE) + texture_gl->t.flags &= ~WINED3D_TEXTURE_DOWNLOADABLE; + return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index dde334c..71e4d71 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3506,6 +3506,7 @@ struct wined3d_texture_ops #define WINED3D_TEXTURE_DISCARD 0x00002000 #define WINED3D_TEXTURE_GET_DC 0x00004000 #define WINED3D_TEXTURE_GENERATE_MIPMAPS 0x00008000 +#define WINED3D_TEXTURE_DOWNLOADABLE 0x00010000 #define WINED3D_TEXTURE_ASYNC_COLOR_KEY 0x00000001

1 0

Huw Davies : riched20: Don' t calculate the para numbering data if numbering is disabled.
by Alexandre Julliard 19 Aug '19

19 Aug '19

Module: wine Branch: master Commit: ebe31c7919e7a713d58ce76d1bb6874e59ce1d83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebe31c7919e7a713d58ce76d… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Aug 19 10:55:30 2019 +0100 riched20: Don't calculate the para numbering data if numbering is disabled. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/para.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 79f8357..bde0654 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -401,6 +401,7 @@ void para_num_init( ME_Context *c, ME_Paragraph *para ) static const WCHAR spaceW[] = {' ', 0}; SIZE sz; + if (!para->fmt.wNumbering) return; if (para->para_num.style && para->para_num.text) return; if (!para->para_num.style)

1 0

Huw Davies : riched20: Use PatBlt() instead of FillRect() to paint the background area.
by Alexandre Julliard 19 Aug '19

19 Aug '19

Module: wine Branch: master Commit: cfeb4358b5382d92f987f81b2e4320b570b5bae8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cfeb4358b5382d92f987f81b… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Aug 19 10:55:29 2019 +0100 riched20: Use PatBlt() instead of FillRect() to paint the background area. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 18 +++++++++++------- dlls/riched20/paint.c | 36 +++++++++++++++++------------------- 2 files changed, 28 insertions(+), 26 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index b10f719..c4a6902 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4983,42 +4983,46 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, { case WM_PAINT: { - HDC hDC; + HDC hdc; RECT rc; PAINTSTRUCT ps; + HBRUSH old_brush; update_caret(editor); - hDC = BeginPaint(editor->hWnd, &ps); + hdc = BeginPaint(editor->hWnd, &ps); if (!editor->bEmulateVersion10 || (editor->nEventMask & ENM_UPDATE)) ME_SendOldNotify(editor, EN_UPDATE); + old_brush = SelectObject(hdc, editor->hbrBackground); + /* Erase area outside of the formatting rectangle */ if (ps.rcPaint.top < editor->rcFormat.top) { rc = ps.rcPaint; rc.bottom = editor->rcFormat.top; - FillRect(hDC, &rc, editor->hbrBackground); + PatBlt(hdc, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY); ps.rcPaint.top = editor->rcFormat.top; } if (ps.rcPaint.bottom > editor->rcFormat.bottom) { rc = ps.rcPaint; rc.top = editor->rcFormat.bottom; - FillRect(hDC, &rc, editor->hbrBackground); + PatBlt(hdc, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY); ps.rcPaint.bottom = editor->rcFormat.bottom; } if (ps.rcPaint.left < editor->rcFormat.left) { rc = ps.rcPaint; rc.right = editor->rcFormat.left; - FillRect(hDC, &rc, editor->hbrBackground); + PatBlt(hdc, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY); ps.rcPaint.left = editor->rcFormat.left; } if (ps.rcPaint.right > editor->rcFormat.right) { rc = ps.rcPaint; rc.left = editor->rcFormat.right; - FillRect(hDC, &rc, editor->hbrBackground); + PatBlt(hdc, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY); ps.rcPaint.right = editor->rcFormat.right; } - ME_PaintContent(editor, hDC, &ps.rcPaint); + ME_PaintContent(editor, hdc, &ps.rcPaint); + SelectObject(hdc, old_brush); EndPaint(editor->hWnd, &ps); return 0; } diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 94fe051..72128072 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -43,6 +43,7 @@ void ME_PaintContent(ME_TextEditor *editor, HDC hDC, const RECT *rcUpdate) ME_InitContext(&c, editor, hDC); SetBkMode(hDC, TRANSPARENT); + item = editor->pBuffer->pFirst->next; /* This context point is an offset for the paragraph positions stored * during wrapping. It shouldn't be modified during painting. */ @@ -86,7 +87,7 @@ void ME_PaintContent(ME_TextEditor *editor, HDC hDC, const RECT *rcUpdate) IntersectRect(&rc, &rc, rcUpdate); if (!IsRectEmpty(&rc)) - FillRect(hDC, &rc, c.editor->hbrBackground); + PatBlt(hDC, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY); } if (editor->nTotalLength != editor->nLastTotalLength || editor->nTotalWidth != editor->nLastTotalWidth) @@ -597,7 +598,7 @@ static void ME_DrawParaDecoration(ME_Context* c, ME_Paragraph* para, int y, RECT rc.top = y; bounds->top = ME_twips2pointsY(c, para->fmt.dySpaceBefore); rc.bottom = y + bounds->top + top_border; - FillRect(c->hDC, &rc, c->editor->hbrBackground); + PatBlt(c->hDC, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY); } if (para->fmt.dwMask & PFM_SPACEAFTER) @@ -607,7 +608,7 @@ static void ME_DrawParaDecoration(ME_Context* c, ME_Paragraph* para, int y, RECT rc.bottom = y + para->nHeight; bounds->bottom = ME_twips2pointsY(c, para->fmt.dySpaceAfter); rc.top = rc.bottom - bounds->bottom - bottom_border; - FillRect(c->hDC, &rc, c->editor->hbrBackground); + PatBlt(c->hDC, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY); } /* Native richedit doesn't support paragraph borders in v1.0 - 4.1, @@ -646,7 +647,7 @@ static void ME_DrawParaDecoration(ME_Context* c, ME_Paragraph* para, int y, RECT rc.right = rc.left + border_width; rc.top = y + bounds->top; rc.bottom = y + para->nHeight - bounds->bottom; - FillRect(c->hDC, &rc, c->editor->hbrBackground); + PatBlt(c->hDC, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY); MoveToEx(c->hDC, c->pt.x + pen_width + 1, y + bounds->top + DD(4), NULL); LineTo(c->hDC, c->pt.x + pen_width + 1, y + para->nHeight - bounds->bottom - DD(8)); } @@ -661,7 +662,7 @@ static void ME_DrawParaDecoration(ME_Context* c, ME_Paragraph* para, int y, RECT rc.right = rc.left + pen_width; rc.top = y + bounds->top; rc.bottom = y + para->nHeight - bounds->bottom; - FillRect(c->hDC, &rc, c->editor->hbrBackground); + PatBlt(c->hDC, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY); MoveToEx(c->hDC, rightEdge - 1 - pen_width - 1, y + bounds->top + DD(4), NULL); LineTo(c->hDC, rightEdge - 1 - pen_width - 1, y + para->nHeight - bounds->bottom - DD(8)); } @@ -725,9 +726,8 @@ static void ME_DrawTableBorders(ME_Context *c, ME_DisplayItem *paragraph) rc.top = top + width; width = cell->yTextOffset - width; rc.bottom = rc.top + width; - if (width) { - FillRect(c->hDC, &rc, c->editor->hbrBackground); - } + if (width) + PatBlt(c->hDC, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY); } /* Draw cell borders. * The order borders are draw in is left, top, bottom, right in order @@ -966,18 +966,18 @@ static void ME_DrawParagraph(ME_Context *c, ME_DisplayItem *paragraph) rc.bottom = y + p->member.row.nHeight; } visible = RectVisible(c->hDC, &rc); - if (visible) { - FillRect(c->hDC, &rc, c->editor->hbrBackground); - } + if (visible) + PatBlt(c->hDC, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY); if (bounds.right) { /* If scrolled to the right past the end of the text, then * there may be space to the right of the paragraph border. */ - RECT rcAfterBrdr = rc; - rcAfterBrdr.left = rc.right + bounds.right; - rcAfterBrdr.right = c->rcView.right; - if (RectVisible(c->hDC, &rcAfterBrdr)) - FillRect(c->hDC, &rcAfterBrdr, c->editor->hbrBackground); + RECT after_bdr = rc; + after_bdr.left = rc.right + bounds.right; + after_bdr.right = c->rcView.right; + if (RectVisible(c->hDC, &after_bdr)) + PatBlt(c->hDC, after_bdr.left, after_bdr.top, after_bdr.right - after_bdr.left, + after_bdr.bottom - after_bdr.top, PATCOPY); } if (me_debug) { @@ -1026,9 +1026,7 @@ static void ME_DrawParagraph(ME_Context *c, ME_DisplayItem *paragraph) rc.top = c->pt.y + para->pt.y + para->nHeight; rc.bottom = c->pt.y + p->member.cell.pt.y + p->member.cell.nHeight; if (RectVisible(c->hDC, &rc)) - { - FillRect(c->hDC, &rc, c->editor->hbrBackground); - } + PatBlt(c->hDC, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY); break; default: break;

1 0

Huw Davies : riched20: Allow the style to remain selected in the context.
by Alexandre Julliard 19 Aug '19

19 Aug '19

Module: wine Branch: master Commit: 6f1cc1f3b5eadadd8a97a8f15ff82d2a83261f66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f1cc1f3b5eadadd8a97a8f1… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Aug 19 10:55:28 2019 +0100 riched20: Allow the style to remain selected in the context. This avoids swapping out the font if the next run uses the same style. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/context.c | 5 ++- dlls/riched20/editor.h | 3 +- dlls/riched20/editstr.h | 2 ++ dlls/riched20/paint.c | 13 ++----- dlls/riched20/para.c | 4 +-- dlls/riched20/run.c | 23 ++++++------ dlls/riched20/style.c | 94 +++++++++++++++++++++++++++---------------------- dlls/riched20/wrap.c | 5 +-- 8 files changed, 75 insertions(+), 74 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6f1cc1f3b5eadadd8a97…

1 0

Huw Davies : riched20: Move release_font_cache() further up the file.
by Alexandre Julliard 19 Aug '19

19 Aug '19

Module: wine Branch: master Commit: da9bc7cd9585a0d1554b8119b692ec6235037ef5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da9bc7cd9585a0d1554b8119… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Aug 19 10:55:27 2019 +0100 riched20: Move release_font_cache() further up the file. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/style.c | 105 ++++++++++++++++++++++++++------------------------ 1 file changed, 55 insertions(+), 50 deletions(-) diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index 1be1c15..fca0cef 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -357,64 +357,69 @@ static BOOL ME_IsFontEqual(const LOGFONTW *p1, const LOGFONTW *p2) return TRUE; } -HFONT ME_SelectStyleFont(ME_Context *c, ME_Style *s) +static void release_font_cache(ME_FontCacheItem *item) { - HFONT hOldFont; - LOGFONTW lf; - int i, nEmpty, nAge = 0x7FFFFFFF; - ME_FontCacheItem *item; - assert(s); - - ME_LogFontFromStyle(c, &lf, s); - - for (i=0; i<HFONT_CACHE_SIZE; i++) - c->editor->pFontCache[i].nAge++; - for (i=0, nEmpty=-1, nAge=0; i<HFONT_CACHE_SIZE; i++) - { - item = &c->editor->pFontCache[i]; - if (!item->nRefs) + if (item->nRefs > 0) { - if (item->nAge > nAge) - nEmpty = i, nAge = item->nAge; - } - if (item->hFont && ME_IsFontEqual(&item->lfSpecs, &lf)) - break; - } - if (i < HFONT_CACHE_SIZE) /* found */ - { - item = &c->editor->pFontCache[i]; - TRACE_(richedit_style)("font reused %d\n", i); - item->nRefs++; - } - else - { - item = &c->editor->pFontCache[nEmpty]; /* this legal even when nEmpty == -1, as we don't dereference it */ - - assert(nEmpty != -1); /* otherwise we leak cache entries or get too many fonts at once*/ - if (item->hFont) { - TRACE_(richedit_style)("font deleted %d\n", nEmpty); - DeleteObject(item->hFont); - item->hFont = NULL; + item->nRefs--; + item->nAge = 0; } - item->hFont = CreateFontIndirectW(&lf); - TRACE_(richedit_style)("font created %d\n", nEmpty); - item->nRefs = 1; - item->lfSpecs = lf; - } - s->font_cache = item; - hOldFont = SelectObject(c->hDC, item->hFont); - /* should be cached too, maybe ? */ - GetTextMetricsW(c->hDC, &s->tm); - return hOldFont; } -static void release_font_cache(ME_FontCacheItem *item) +HFONT ME_SelectStyleFont( ME_Context *c, ME_Style *s ) { - if (item->nRefs > 0) + HFONT old_font; + LOGFONTW lf; + int i, empty, age = 0x7FFFFFFF; + ME_FontCacheItem *item; + + assert( s ); + + ME_LogFontFromStyle( c, &lf, s ); + + for (i = 0; i < HFONT_CACHE_SIZE; i++) + c->editor->pFontCache[i].nAge++; + for (i = 0, empty = -1, age = 0; i < HFONT_CACHE_SIZE; i++) { - item->nRefs--; - item->nAge = 0; + item = &c->editor->pFontCache[i]; + if (!item->nRefs) + { + if (item->nAge > age) + { + empty = i; + age = item->nAge; + } + } + + if (item->hFont && ME_IsFontEqual( &item->lfSpecs, &lf )) + break; + } + + if (i < HFONT_CACHE_SIZE) /* found */ + { + item = &c->editor->pFontCache[i]; + TRACE_(richedit_style)( "font reused %d\n", i ); + item->nRefs++; + } + else + { + assert(empty != -1); + item = &c->editor->pFontCache[empty]; + if (item->hFont) + { + TRACE_(richedit_style)( "font deleted %d\n", empty ); + DeleteObject(item->hFont); + item->hFont = NULL; + } + item->hFont = CreateFontIndirectW( &lf ); + TRACE_(richedit_style)( "font created %d\n", empty ); + item->nRefs = 1; + item->lfSpecs = lf; } + s->font_cache = item; + old_font = SelectObject( c->hDC, item->hFont ); + GetTextMetricsW( c->hDC, &s->tm ); + return old_font; } void ME_UnselectStyleFont(ME_Context *c, ME_Style *s, HFONT hOldFont)

1 0

Huw Davies : riched20: Only invalidate the selection if it's not hidden.
by Alexandre Julliard 19 Aug '19

19 Aug '19

Module: wine Branch: master Commit: b9e1ed0668119dc76afdd3d7dc01b5a5626003e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9e1ed0668119dc76afdd3d7… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Aug 19 10:55:26 2019 +0100 riched20: Only invalidate the selection if it's not hidden. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 118c646..b10f719 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2153,9 +2153,9 @@ int set_selection( ME_TextEditor *editor, int to, int from ) TRACE("%d - %d\n", to, from ); - ME_InvalidateSelection( editor ); + if (!editor->bHideSelection) ME_InvalidateSelection( editor ); end = set_selection_cursors( editor, to, from ); - ME_InvalidateSelection( editor ); + if (!editor->bHideSelection) ME_InvalidateSelection( editor ); update_caret( editor ); ME_SendSelChange( editor );

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
71
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 August 2019