August 2019 - Wine-devel - list.winehq.org

[PATCH 5/5] wined3d: Store the maximum number of "compat" varyings in struct wined3d_d3d_limits.
by Henri Verbeet 05 Aug '19

05 Aug '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 20 +++++++++++++++----- dlls/wined3d/shader.c | 2 +- dlls/wined3d/utils.c | 16 +++------------- dlls/wined3d/wined3d_private.h | 9 +++++---- 6 files changed, 26 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 90d9ba69008..e9f894fae3c 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -3769,6 +3769,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, d3d_info->limits.vs_uniform_count = shader_caps.vs_uniform_count; d3d_info->limits.ps_uniform_count = shader_caps.ps_uniform_count; d3d_info->limits.varying_count = shader_caps.varying_count; + d3d_info->limits.max_compat_varying_count = shader_caps.max_compat_varying_count; d3d_info->shader_double_precision = !!(shader_caps.wined3d_caps & WINED3D_SHADER_CAP_DOUBLE_PRECISION); d3d_info->shader_output_interpolation = !!(shader_caps.wined3d_caps & WINED3D_SHADER_CAP_OUTPUT_INTERPOLATION); diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index e1ddb8e9435..fbc469cbcd4 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4957,6 +4957,7 @@ static void shader_arb_get_caps(const struct wined3d_adapter *adapter, struct sh } caps->varying_count = 0; + caps->max_compat_varying_count = 0; caps->wined3d_caps = WINED3D_SHADER_CAP_SRGB_WRITE; if (use_nv_clip(gl_info)) caps->wined3d_caps |= WINED3D_SHADER_CAP_VS_CLIPPING; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 41cf157e84c..29846af7737 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -420,6 +420,15 @@ static void shader_glsl_add_version_declaration(struct wined3d_string_buffer *bu shader_addline(buffer, "#version %u\n", shader_glsl_get_version(gl_info)); } +unsigned int shader_glsl_max_compat_varyings(const struct wined3d_gl_info *gl_info) +{ + /* On core profile we have to also count diffuse and specular colours and + * the fog coordinate. */ + if (gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) + return WINED3D_MAX_TEXTURES * 4; + return (WINED3D_MAX_TEXTURES + 2) * 4 + 1; +} + static void shader_glsl_append_imm_vec(struct wined3d_string_buffer *buffer, const float *values, unsigned int size, const struct wined3d_gl_info *gl_info) { @@ -7146,7 +7155,7 @@ static GLuint shader_glsl_generate_vs3_rasterizer_input_setup(struct shader_glsl if (texcoords_written_mask[i] != WINED3DSP_WRITEMASK_ALL) { - if (gl_info->limits.glsl_varyings < wined3d_max_compat_varyings(gl_info) + if (gl_info->limits.glsl_varyings < shader_glsl_max_compat_varyings(gl_info) && !texcoords_written_mask[i]) continue; @@ -9057,7 +9066,7 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct shader_glsl_priv *pr if (settings->texcoords & (1u << i)) shader_addline(buffer, "ffp_varying_texcoord[%u] = ffp_texture_matrix[%u] * ffp_attrib_texcoord%u;\n", i, i, i); - else if (gl_info->limits.glsl_varyings >= wined3d_max_compat_varyings(gl_info)) + else if (gl_info->limits.glsl_varyings >= shader_glsl_max_compat_varyings(gl_info)) shader_addline(buffer, "ffp_varying_texcoord[%u] = vec4(0.0);\n", i); else output_legacy_texcoord = FALSE; @@ -11093,6 +11102,7 @@ static void shader_glsl_get_caps(const struct wined3d_adapter *adapter, struct s caps->vs_uniform_count = min(WINED3D_MAX_VS_CONSTS_F, gl_info->limits.glsl_vs_float_constants); caps->ps_uniform_count = min(WINED3D_MAX_PS_CONSTS_F, gl_info->limits.glsl_ps_float_constants); caps->varying_count = gl_info->limits.glsl_varyings; + caps->max_compat_varying_count = shader_glsl_max_compat_varyings(gl_info); /* FIXME: The following line is card dependent. -8.0 to 8.0 is the * Direct3D minimum requirement. @@ -11542,7 +11552,7 @@ static void glsl_vertex_pipe_vdecl(struct wined3d_context *context, * Likewise, we have to invalidate the shader when using per-vertex * colours and diffuse/specular attribute presence changes, or when * normal presence changes. */ - if (gl_info->limits.glsl_varyings < wined3d_max_compat_varyings(gl_info) + if (gl_info->limits.glsl_varyings < shader_glsl_max_compat_varyings(gl_info) || (state->render_states[WINED3D_RS_COLORVERTEX] && (diffuse != context->last_was_diffuse || specular != context->last_was_specular)) || normal != context->last_was_normal) @@ -12054,7 +12064,7 @@ static void glsl_fragment_pipe_vdecl(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { /* Because of settings->texcoords_initialized and args->texcoords_initialized. */ - if (context->gl_info->limits.glsl_varyings < wined3d_max_compat_varyings(context->gl_info)) + if (context->gl_info->limits.glsl_varyings < shader_glsl_max_compat_varyings(context->gl_info)) context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_PIXEL; if (!isStateDirty(context, STATE_RENDER(WINED3D_RS_FOGENABLE))) @@ -12065,7 +12075,7 @@ static void glsl_fragment_pipe_vs(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { /* Because of settings->texcoords_initialized and args->texcoords_initialized. */ - if (context->gl_info->limits.glsl_varyings < wined3d_max_compat_varyings(context->gl_info)) + if (context->gl_info->limits.glsl_varyings < shader_glsl_max_compat_varyings(context->gl_info)) context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_PIXEL; } diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 116dd5632f5..2bd201a791c 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -4114,7 +4114,7 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3 } } - if (context->d3d_info->limits.varying_count < wined3d_max_compat_varyings(context->gl_info)) + if (d3d_info->limits.varying_count < d3d_info->limits.max_compat_varying_count) { const struct wined3d_shader *vs = state->shader[WINED3D_SHADER_TYPE_VERTEX]; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 1dfb1700d3a..0df197b86c3 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -5911,13 +5911,6 @@ void multiply_matrix(struct wined3d_matrix *dst, const struct wined3d_matrix *sr *dst = tmp; } -unsigned int wined3d_max_compat_varyings(const struct wined3d_gl_info *gl_info) -{ - /* On core profile we have to also count diffuse and specular colors and the - * fog coordinate. */ - return gl_info->supported[WINED3D_GL_LEGACY_CONTEXT] ? WINED3D_MAX_TEXTURES * 4 : (WINED3D_MAX_TEXTURES + 2) * 4 + 1; -} - void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d_state *state, struct ffp_frag_settings *settings, BOOL ignore_textype) { @@ -5957,7 +5950,6 @@ void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d unsigned int i; DWORD ttff; DWORD cop, aop, carg0, carg1, carg2, aarg0, aarg1, aarg2; - const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_d3d_info *d3d_info = context->d3d_info; settings->padding = 0; @@ -6196,8 +6188,7 @@ void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d * Reading uninitialized varyings on core profile contexts results in an * error while with builtin varyings on legacy contexts you get undefined * behavior. */ - if (d3d_info->limits.varying_count - && d3d_info->limits.varying_count < wined3d_max_compat_varyings(gl_info)) + if (d3d_info->limits.varying_count && d3d_info->limits.varying_count < d3d_info->limits.max_compat_varying_count) { settings->texcoords_initialized = 0; for (i = 0; i < WINED3D_MAX_TEXTURES; ++i) @@ -6378,7 +6369,6 @@ void wined3d_ffp_get_vs_settings(const struct wined3d_context *context, { enum wined3d_material_color_source diffuse_source, emissive_source, ambient_source, specular_source; const struct wined3d_stream_info *si = &context->stream_info; - const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_d3d_info *d3d_info = context->d3d_info; unsigned int coord_idx, i; @@ -6403,7 +6393,7 @@ void wined3d_ffp_get_vs_settings(const struct wined3d_context *context, settings->texcoords |= 1u << i; settings->texgen[i] = state->texture_states[i][WINED3D_TSS_TEXCOORD_INDEX]; } - if (d3d_info->limits.varying_count >= wined3d_max_compat_varyings(gl_info)) + if (d3d_info->limits.varying_count >= d3d_info->limits.max_compat_varying_count) settings->texcoords = (1u << WINED3D_MAX_TEXTURES) - 1; if (d3d_info->emulated_flatshading) @@ -6452,7 +6442,7 @@ void wined3d_ffp_get_vs_settings(const struct wined3d_context *context, settings->texcoords |= 1u << i; settings->texgen[i] = state->texture_states[i][WINED3D_TSS_TEXCOORD_INDEX]; } - if (d3d_info->limits.varying_count >= wined3d_max_compat_varyings(gl_info)) + if (d3d_info->limits.varying_count >= d3d_info->limits.max_compat_varying_count) settings->texcoords = (1u << WINED3D_MAX_TEXTURES) - 1; for (i = 0; i < WINED3D_MAX_ACTIVE_LIGHTS; ++i) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index add1f1c68bd..3c38b27a319 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -175,6 +175,7 @@ struct wined3d_d3d_limits unsigned int max_rt_count; unsigned int max_clip_distances; + unsigned int max_compat_varying_count; unsigned int texture_size; float pointsize_max; }; @@ -1317,10 +1318,11 @@ struct shader_caps unsigned int ps_version; unsigned int cs_version; - DWORD vs_uniform_count; - DWORD ps_uniform_count; + unsigned int vs_uniform_count; + unsigned int ps_uniform_count; float ps_1x_max_value; - DWORD varying_count; + unsigned int varying_count; + unsigned int max_compat_varying_count; DWORD wined3d_caps; }; @@ -2930,7 +2932,6 @@ int wined3d_ffp_vertex_program_key_compare(const void *key, const struct wine_rb extern const struct wined3d_parent_ops wined3d_null_parent_ops DECLSPEC_HIDDEN; -unsigned int wined3d_max_compat_varyings(const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d_state *state, struct ffp_frag_settings *settings, BOOL ignore_textype) DECLSPEC_HIDDEN; const struct ffp_frag_desc *find_ffp_frag_shader(const struct wine_rb_tree *fragment_shaders, -- 2.11.0

1 0

[PATCH 4/5] wined3d: Store fixed-function alpha test support in struct wined3d_d3d_info.
by Henri Verbeet 05 Aug '19

05 Aug '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/shader.c | 2 +- dlls/wined3d/utils.c | 2 +- dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 52fd6851f82..90d9ba69008 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -3777,6 +3777,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, adapter->vertex_pipe->vp_get_caps(adapter, &vertex_caps); d3d_info->xyzrhw = vertex_caps.xyzrhw; d3d_info->ffp_generic_attributes = vertex_caps.ffp_generic_attributes; + d3d_info->ffp_alpha_test = !!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]; d3d_info->limits.ffp_vertex_blend_matrices = vertex_caps.max_vertex_blend_matrices; d3d_info->limits.active_light_count = vertex_caps.max_active_lights; d3d_info->emulated_flatshading = vertex_caps.emulated_flatshading; diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index ac3de3d776e..116dd5632f5 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -4146,7 +4146,7 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3 args->pointsprite = state->render_states[WINED3D_RS_POINTSPRITEENABLE] && state->gl_primitive_type == GL_POINTS; - if (gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) + if (d3d_info->ffp_alpha_test) args->alpha_test_func = WINED3D_CMP_ALWAYS - 1; else args->alpha_test_func = (state->render_states[WINED3D_RS_ALPHATESTENABLE] diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 31eca98665f..1dfb1700d3a 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -6226,7 +6226,7 @@ void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d settings->pointsprite = state->render_states[WINED3D_RS_POINTSPRITEENABLE] && state->gl_primitive_type == GL_POINTS; - if (gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) + if (d3d_info->ffp_alpha_test) settings->alpha_test_func = WINED3D_CMP_ALWAYS - 1; else settings->alpha_test_func = (state->render_states[WINED3D_RS_ALPHATESTENABLE] diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 76a938a3e8c..add1f1c68bd 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -202,6 +202,7 @@ struct wined3d_d3d_info uint32_t xyzrhw : 1; uint32_t emulated_flatshading : 1; uint32_t ffp_generic_attributes : 1; + uint32_t ffp_alpha_test : 1; uint32_t vs_clipping : 1; uint32_t shader_color_key : 1; uint32_t shader_double_precision : 1; -- 2.11.0

1 0

[PATCH 3/5] wined3d: Store clip control support in struct wined3d_d3d_info.
by Henri Verbeet 05 Aug '19

05 Aug '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/utils.c | 8 +++++--- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index abfa31b324a..52fd6851f82 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -3796,6 +3796,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, d3d_info->texture_swizzle = !!gl_info->supported[ARB_TEXTURE_SWIZZLE]; d3d_info->srgb_read_control = !!gl_info->supported[EXT_TEXTURE_SRGB_DECODE]; d3d_info->srgb_write_control = !!gl_info->supported[ARB_FRAMEBUFFER_SRGB]; + d3d_info->clip_control = !!gl_info->supported[ARB_CLIP_CONTROL]; if (gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) d3d_info->multisample_draw_location = WINED3D_LOCATION_TEXTURE_RGB; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 1e99deb079d..31eca98665f 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -5392,8 +5392,8 @@ void get_modelview_matrix(const struct wined3d_context *context, const struct wi void get_projection_matrix(const struct wined3d_context *context, const struct wined3d_state *state, struct wined3d_matrix *mat) { - BOOL clip_control = context->gl_info->supported[ARB_CLIP_CONTROL]; - BOOL flip = !clip_control && context->render_offscreen; + const struct wined3d_d3d_info *d3d_info = context->d3d_info; + BOOL clip_control, flip; float center_offset; /* There are a couple of additional things we have to take into account @@ -5411,7 +5411,9 @@ void get_projection_matrix(const struct wined3d_context *context, const struct w * driver, but small enough to prevent it from interfering with any * anti-aliasing. */ - if (!clip_control && context->d3d_info->wined3d_creation_flags & WINED3D_PIXEL_CENTER_INTEGER) + clip_control = d3d_info->clip_control; + flip = !clip_control && context->render_offscreen; + if (!clip_control && d3d_info->wined3d_creation_flags & WINED3D_PIXEL_CENTER_INTEGER) center_offset = 63.0f / 64.0f; else center_offset = -1.0f / 64.0f; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a21721a675e..76a938a3e8c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -214,6 +214,7 @@ struct wined3d_d3d_info uint32_t texture_swizzle : 1; uint32_t srgb_read_control : 1; uint32_t srgb_write_control : 1; + uint32_t clip_control : 1; enum wined3d_feature_level feature_level; DWORD multisample_draw_location; -- 2.11.0

1 0

[PATCH 2/5] wined3d: Store sRGB write control support in struct wined3d_d3d_info.
by Henri Verbeet 05 Aug '19

05 Aug '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/shader.c | 2 +- dlls/wined3d/utils.c | 2 +- dlls/wined3d/wined3d_private.h | 31 ++++++++++++++++--------------- 4 files changed, 19 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 8e06bf28897..abfa31b324a 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -3795,6 +3795,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, d3d_info->vertex_bgra = !!gl_info->supported[ARB_VERTEX_ARRAY_BGRA]; d3d_info->texture_swizzle = !!gl_info->supported[ARB_TEXTURE_SWIZZLE]; d3d_info->srgb_read_control = !!gl_info->supported[EXT_TEXTURE_SRGB_DECODE]; + d3d_info->srgb_write_control = !!gl_info->supported[ARB_FRAMEBUFFER_SRGB]; if (gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) d3d_info->multisample_draw_location = WINED3D_LOCATION_TEXTURE_RGB; diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 1d8540e5e94..ac3de3d776e 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3902,7 +3902,7 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3 unsigned int i; memset(args, 0, sizeof(*args)); /* FIXME: Make sure all bits are set. */ - if (!gl_info->supported[ARB_FRAMEBUFFER_SRGB] && needs_srgb_write(context, state, state->fb)) + if (!d3d_info->srgb_write_control && needs_srgb_write(context, state, state->fb)) { static unsigned int warned = 0; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 0872b1007a4..1e99deb079d 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -6167,7 +6167,7 @@ void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d break; } } - settings->sRGB_write = !gl_info->supported[ARB_FRAMEBUFFER_SRGB] && needs_srgb_write(context, state, state->fb); + settings->sRGB_write = !d3d_info->srgb_write_control && needs_srgb_write(context, state, state->fb); if (d3d_info->vs_clipping || !use_vs(state) || !state->render_states[WINED3D_RS_CLIPPING] || !state->render_states[WINED3D_RS_CLIPPLANEENABLE]) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fe4510e01bf..a21721a675e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -198,21 +198,22 @@ struct wined3d_d3d_info { struct wined3d_d3d_limits limits; struct wined3d_ffp_attrib_ops ffp_attrib_ops; - unsigned int wined3d_creation_flags; - unsigned int xyzrhw : 1; - unsigned int emulated_flatshading : 1; - unsigned int ffp_generic_attributes : 1; - unsigned int vs_clipping : 1; - unsigned int shader_color_key : 1; - unsigned int shader_double_precision : 1; - unsigned int shader_output_interpolation : 1; - unsigned int viewport_array_index_any_shader : 1; - unsigned int texture_npot : 1; - unsigned int texture_npot_conditional : 1; - unsigned int draw_base_vertex_offset : 1; - unsigned int vertex_bgra : 1; - unsigned int texture_swizzle : 1; - unsigned int srgb_read_control : 1; + uint32_t wined3d_creation_flags; + uint32_t xyzrhw : 1; + uint32_t emulated_flatshading : 1; + uint32_t ffp_generic_attributes : 1; + uint32_t vs_clipping : 1; + uint32_t shader_color_key : 1; + uint32_t shader_double_precision : 1; + uint32_t shader_output_interpolation : 1; + uint32_t viewport_array_index_any_shader : 1; + uint32_t texture_npot : 1; + uint32_t texture_npot_conditional : 1; + uint32_t draw_base_vertex_offset : 1; + uint32_t vertex_bgra : 1; + uint32_t texture_swizzle : 1; + uint32_t srgb_read_control : 1; + uint32_t srgb_write_control : 1; enum wined3d_feature_level feature_level; DWORD multisample_draw_location; -- 2.11.0

1 0

[PATCH 1/5] wined3d: Store sRGB read control support in struct wined3d_d3d_info.
by Henri Verbeet 05 Aug '19

05 Aug '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/wined3d_private.h | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 5f6d673bfdf..8e06bf28897 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -3794,6 +3794,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, d3d_info->draw_base_vertex_offset = !!gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX]; d3d_info->vertex_bgra = !!gl_info->supported[ARB_VERTEX_ARRAY_BGRA]; d3d_info->texture_swizzle = !!gl_info->supported[ARB_TEXTURE_SWIZZLE]; + d3d_info->srgb_read_control = !!gl_info->supported[EXT_TEXTURE_SRGB_DECODE]; if (gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) d3d_info->multisample_draw_location = WINED3D_LOCATION_TEXTURE_RGB; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fd68cbd3ee2..fe4510e01bf 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -212,6 +212,7 @@ struct wined3d_d3d_info unsigned int draw_base_vertex_offset : 1; unsigned int vertex_bgra : 1; unsigned int texture_swizzle : 1; + unsigned int srgb_read_control : 1; enum wined3d_feature_level feature_level; DWORD multisample_draw_location; @@ -4819,7 +4820,7 @@ static inline BOOL needs_separate_srgb_gl_texture(const struct wined3d_context * unsigned int flags = texture->resource.format_flags & (WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE); - return (!context->gl_info->supported[EXT_TEXTURE_SRGB_DECODE] + return (!context->d3d_info->srgb_read_control || (flags && flags != (WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE))) && context->d3d_info->wined3d_creation_flags & WINED3D_SRGB_READ_WRITE_CONTROL; } -- 2.11.0

1 0

[PATCH v10 1/9] user32: Add support for RIDEV_NOLEGACY flag.
by Derek Lesho 05 Aug '19

05 Aug '19

Signed-off-by: Derek Lesho <dereklesho52(a)Gmail.com> --- dlls/user32/rawinput.c | 2 +- server/queue.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 49cf9f73a0..58480b8ae7 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -271,7 +271,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH RegisterRawInputDevices(RAWINPUTDEVICE *devices, U TRACE("device %u: page %#x, usage %#x, flags %#x, target %p.\n", i, devices[i].usUsagePage, devices[i].usUsage, devices[i].dwFlags, devices[i].hwndTarget); - if (devices[i].dwFlags & ~RIDEV_REMOVE) + if (devices[i].dwFlags & ~(RIDEV_REMOVE|RIDEV_NOLEGACY)) FIXME("Unhandled flags %#x for device %u.\n", devices[i].dwFlags, i); d[i].usage_page = devices[i].usUsagePage; diff --git a/server/queue.c b/server/queue.c index 96587d11d1..055bc1ff3c 100644 --- a/server/queue.c +++ b/server/queue.c @@ -372,6 +372,9 @@ static void set_cursor_pos( struct desktop *desktop, int x, int y ) static const struct hw_msg_source source = { IMDT_UNAVAILABLE, IMO_SYSTEM }; struct message *msg; + if (current->process->rawinput_mouse && + current->process->rawinput_mouse->flags & RIDEV_NOLEGACY) return; + if (!(msg = alloc_hardware_message( 0, source, get_tick_count() ))) return; msg->msg = WM_MOUSEMOVE; @@ -1668,6 +1671,9 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons msg_data->rawinput.mouse.data = input->mouse.data; queue_hardware_message( desktop, msg, 0 ); + + if (device->flags & RIDEV_NOLEGACY) + return FALSE; } for (i = 0; i < ARRAY_SIZE( messages ); i++) @@ -1793,6 +1799,9 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c msg_data->rawinput.kbd.scan = input->kbd.scan; queue_hardware_message( desktop, msg, 0 ); + + if (device->flags & RIDEV_NOLEGACY) + return FALSE; } if (!(msg = alloc_hardware_message( input->kbd.info, source, time ))) return 0; -- 2.22.0

4 42

[PATCH 1/2] d3dx9: Get rid of unused unlock_surface() argument.
by Matteo Bruni 05 Aug '19

05 Aug '19

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3dx9_36/d3dx9_private.h | 2 +- dlls/d3dx9_36/surface.c | 16 ++++++++-------- dlls/d3dx9_36/texture.c | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h index c1a279283d8..9497343f422 100644 --- a/dlls/d3dx9_36/d3dx9_private.h +++ b/dlls/d3dx9_36/d3dx9_private.h @@ -123,7 +123,7 @@ HRESULT load_volume_texture_from_dds(IDirect3DVolumeTexture9 *volume_texture, co const PALETTEENTRY *palette, DWORD filter, DWORD color_key, const D3DXIMAGE_INFO *src_info) DECLSPEC_HIDDEN; HRESULT lock_surface(IDirect3DSurface9 *surface, const RECT *surface_rect, D3DLOCKED_RECT *lock, IDirect3DSurface9 **temp_surface, BOOL write) DECLSPEC_HIDDEN; -HRESULT unlock_surface(IDirect3DSurface9 *surface, const RECT *surface_rect, D3DLOCKED_RECT *lock, +HRESULT unlock_surface(IDirect3DSurface9 *surface, const RECT *surface_rect, IDirect3DSurface9 *temp_surface, BOOL update) DECLSPEC_HIDDEN; unsigned short float_32_to_16(const float in) DECLSPEC_HIDDEN; diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 44e19ec09b6..8e9b834d882 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -256,7 +256,7 @@ HRESULT lock_surface(IDirect3DSurface9 *surface, const RECT *surface_rect, D3DLO return hr; } -HRESULT unlock_surface(IDirect3DSurface9 *surface, const RECT *surface_rect, D3DLOCKED_RECT *lock, +HRESULT unlock_surface(IDirect3DSurface9 *surface, const RECT *surface_rect, IDirect3DSurface9 *temp_surface, BOOL update) { IDirect3DDevice9 *device; @@ -608,7 +608,7 @@ static HRESULT save_dds_surface_to_memory(ID3DXBuffer **dst_buffer, IDirect3DSur copy_pixels(locked_rect.pBits, locked_rect.Pitch, 0, pixels, dst_pitch, 0, &volume, pixel_format); - unlock_surface(src_surface, NULL, &locked_rect, temp_surface, FALSE); + unlock_surface(src_surface, NULL, temp_surface, FALSE); *dst_buffer = buffer; return D3D_OK; @@ -1912,7 +1912,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, && src_size.height != surfdesc.Height)) { WARN("Source rect %s is misaligned.\n", wine_dbgstr_rect(src_rect)); - unlock_surface(dst_surface, dst_rect, &lockrect, surface, FALSE); + unlock_surface(dst_surface, dst_rect, surface, FALSE); return D3DXERR_INVALIDDATA; } @@ -1925,7 +1925,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, || !is_conversion_to_supported(destformatdesc)) { FIXME("Unsupported format conversion %#x -> %#x.\n", src_format, surfdesc.Format); - unlock_surface(dst_surface, dst_rect, &lockrect, surface, FALSE); + unlock_surface(dst_surface, dst_rect, surface, FALSE); return E_NOTIMPL; } @@ -1946,7 +1946,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, } } - return unlock_surface(dst_surface, dst_rect, &lockrect, surface, TRUE); + return unlock_surface(dst_surface, dst_rect, surface, TRUE); } /************************************************************ @@ -2036,7 +2036,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromSurface(IDirect3DSurface9 *dst_surface, hr = D3DXLoadSurfaceFromMemory(dst_surface, dst_palette, dst_rect, lock.pBits, src_desc.Format, lock.Pitch, src_palette, src_rect, filter, color_key); - if (FAILED(unlock_surface(src_surface, NULL, &lock, temp_surface, FALSE))) + if (FAILED(unlock_surface(src_surface, NULL, temp_surface, FALSE))) return D3DXERR_INVALIDDATA; return hr; @@ -2217,7 +2217,7 @@ HRESULT WINAPI D3DXSaveSurfaceToFileInMemory(ID3DXBuffer **dst_buffer, D3DXIMAGE IWICBitmapFrameEncode_WritePixels(frame, height, locked_rect.Pitch, height * locked_rect.Pitch, locked_rect.pBits); - unlock_surface(src_surface, src_rect, &locked_rect, temp_surface, FALSE); + unlock_surface(src_surface, src_rect, temp_surface, FALSE); } else /* Pixel format conversion */ { @@ -2254,7 +2254,7 @@ HRESULT WINAPI D3DXSaveSurfaceToFileInMemory(ID3DXBuffer **dst_buffer, D3DXIMAGE } convert_argb_pixels(locked_rect.pBits, locked_rect.Pitch, 0, &size, src_format_desc, dst_data, dst_pitch, 0, &size, dst_format_desc, 0, NULL); - unlock_surface(src_surface, src_rect, &locked_rect, temp_surface, FALSE); + unlock_surface(src_surface, src_rect, temp_surface, FALSE); IWICBitmapFrameEncode_WritePixels(frame, height, dst_pitch, dst_pitch * height, dst_data); HeapFree(GetProcessHeap(), 0, dst_data); diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 74a32b46be1..26d07ca9f66 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -1379,7 +1379,7 @@ HRESULT WINAPI D3DXFillTexture(struct IDirect3DTexture9 *texture, LPD3DXFILL2D f fill_texture(format, data + y * lock_rect.Pitch + x * format->bytes_per_pixel, &value); } } - if (FAILED(hr = unlock_surface(surface, NULL, &lock_rect, temp_surface, TRUE))) + if (FAILED(hr = unlock_surface(surface, NULL, temp_surface, TRUE))) { IDirect3DSurface9_Release(surface); return hr; -- 2.21.0

2 3

[PATCH] d3dx9: Pass rectangle to {lock|unlock}_surface().
by Paul Gofman 05 Aug '19

05 Aug '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47546 This fixes regressions introduced by commits 65956ae50a136fe8467a0332c7495f36617a16dc, 092c14b9d86ee1e96e465908cc524ec85988d0ff. Surface source or destination rectangles were left behind. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/d3dx9_36/d3dx9_private.h | 4 +- dlls/d3dx9_36/surface.c | 68 +++++++++----- dlls/d3dx9_36/tests/surface.c | 166 +++++++++++++++++++++------------- dlls/d3dx9_36/texture.c | 4 +- 4 files changed, 154 insertions(+), 88 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h index 87e4d69474..aeae768451 100644 --- a/dlls/d3dx9_36/d3dx9_private.h +++ b/dlls/d3dx9_36/d3dx9_private.h @@ -121,9 +121,9 @@ HRESULT load_volume_from_dds(IDirect3DVolume9 *dst_volume, const PALETTEENTRY *d const D3DXIMAGE_INFO *src_info) DECLSPEC_HIDDEN; HRESULT load_volume_texture_from_dds(IDirect3DVolumeTexture9 *volume_texture, const void *src_data, const PALETTEENTRY *palette, DWORD filter, DWORD color_key, const D3DXIMAGE_INFO *src_info) DECLSPEC_HIDDEN; -HRESULT lock_surface(IDirect3DSurface9 *surface, D3DLOCKED_RECT *lock, +HRESULT lock_surface(IDirect3DSurface9 *surface, const RECT *surface_rect, D3DLOCKED_RECT *lock, IDirect3DSurface9 **temp_surface, BOOL write) DECLSPEC_HIDDEN; -HRESULT unlock_surface(IDirect3DSurface9 *surface, D3DLOCKED_RECT *lock, +HRESULT unlock_surface(IDirect3DSurface9 *surface, const RECT *surface_rect, D3DLOCKED_RECT *lock, IDirect3DSurface9 *temp_surface, BOOL update) DECLSPEC_HIDDEN; unsigned short float_32_to_16(const float in) DECLSPEC_HIDDEN; diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 57d9818cd9..44e19ec09b 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -198,9 +198,10 @@ static const struct { { 32, 0x000000ff, 0x0000ff00, 0x00ff0000, 0x00000000, D3DFMT_X8B8G8R8 }, }; -HRESULT lock_surface(IDirect3DSurface9 *surface, D3DLOCKED_RECT *lock, +HRESULT lock_surface(IDirect3DSurface9 *surface, const RECT *surface_rect, D3DLOCKED_RECT *lock, IDirect3DSurface9 **temp_surface, BOOL write) { + unsigned int width, height; IDirect3DDevice9 *device; D3DSURFACE_DESC desc; DWORD lock_flag; @@ -208,25 +209,36 @@ HRESULT lock_surface(IDirect3DSurface9 *surface, D3DLOCKED_RECT *lock, lock_flag = write ? D3DLOCK_DISCARD : D3DLOCK_READONLY; *temp_surface = NULL; - if (FAILED(hr = IDirect3DSurface9_LockRect(surface, lock, NULL, lock_flag))) + if (FAILED(hr = IDirect3DSurface9_LockRect(surface, lock, surface_rect, lock_flag))) { IDirect3DSurface9_GetDevice(surface, &device); IDirect3DSurface9_GetDesc(surface, &desc); - hr = write ? IDirect3DDevice9_CreateOffscreenPlainSurface(device, desc.Width, desc.Height, + if (surface_rect) + { + width = surface_rect->right - surface_rect->left; + height = surface_rect->bottom - surface_rect->top; + } + else + { + width = desc.Width; + height = desc.Height; + } + + hr = write ? IDirect3DDevice9_CreateOffscreenPlainSurface(device, width, height, desc.Format, D3DPOOL_SYSTEMMEM, temp_surface, NULL) - : IDirect3DDevice9_CreateRenderTarget(device, desc.Width, desc.Height, + : IDirect3DDevice9_CreateRenderTarget(device, width, height, desc.Format, D3DMULTISAMPLE_NONE, 0, TRUE, temp_surface, NULL); if (FAILED(hr)) { WARN("Failed to create temporary surface, surface %p, format %#x," " usage %#x, pool %#x, write %#x, width %u, height %u.\n", - surface, desc.Format, desc.Usage, desc.Pool, write, desc.Width, desc.Height); + surface, desc.Format, desc.Usage, desc.Pool, write, width, height); IDirect3DDevice9_Release(device); return hr; } - if (write || SUCCEEDED(hr = IDirect3DDevice9_StretchRect(device, surface, NULL, + if (write || SUCCEEDED(hr = IDirect3DDevice9_StretchRect(device, surface, surface_rect, *temp_surface, NULL, D3DTEXF_NONE))) hr = IDirect3DSurface9_LockRect(*temp_surface, lock, NULL, lock_flag); @@ -244,20 +256,34 @@ HRESULT lock_surface(IDirect3DSurface9 *surface, D3DLOCKED_RECT *lock, return hr; } -HRESULT unlock_surface(IDirect3DSurface9 *surface, D3DLOCKED_RECT *lock, +HRESULT unlock_surface(IDirect3DSurface9 *surface, const RECT *surface_rect, D3DLOCKED_RECT *lock, IDirect3DSurface9 *temp_surface, BOOL update) { IDirect3DDevice9 *device; + POINT surface_point; HRESULT hr; if (!temp_surface) - return IDirect3DSurface9_UnlockRect(surface); + { + hr = IDirect3DSurface9_UnlockRect(surface); + return hr; + } hr = IDirect3DSurface9_UnlockRect(temp_surface); if (update) { + if (surface_rect) + { + surface_point.x = surface_rect->left; + surface_point.y = surface_rect->top; + } + else + { + surface_point.x = 0; + surface_point.y = 0; + } IDirect3DSurface9_GetDevice(surface, &device); - if (FAILED(hr = IDirect3DDevice9_UpdateSurface(device, temp_surface, NULL, surface, NULL))) + if (FAILED(hr = IDirect3DDevice9_UpdateSurface(device, temp_surface, NULL, surface, &surface_point))) WARN("Updating surface failed, hr %#x, surface %p, temp_surface %p.\n", hr, surface, temp_surface); IDirect3DDevice9_Release(device); @@ -569,7 +595,7 @@ static HRESULT save_dds_surface_to_memory(ID3DXBuffer **dst_buffer, IDirect3DSur return hr; } - hr = lock_surface(src_surface, &locked_rect, &temp_surface, FALSE); + hr = lock_surface(src_surface, NULL, &locked_rect, &temp_surface, FALSE); if (FAILED(hr)) { ID3DXBuffer_Release(buffer); @@ -582,7 +608,7 @@ static HRESULT save_dds_surface_to_memory(ID3DXBuffer **dst_buffer, IDirect3DSur copy_pixels(locked_rect.pBits, locked_rect.Pitch, 0, pixels, dst_pitch, 0, &volume, pixel_format); - unlock_surface(src_surface, &locked_rect, temp_surface, FALSE); + unlock_surface(src_surface, NULL, &locked_rect, temp_surface, FALSE); *dst_buffer = buffer; return D3D_OK; @@ -1870,7 +1896,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, return E_NOTIMPL; } - if (FAILED(hr = lock_surface(dst_surface, &lockrect, &surface, TRUE))) + if (FAILED(hr = lock_surface(dst_surface, dst_rect, &lockrect, &surface, TRUE))) return hr; if (src_format == surfdesc.Format @@ -1886,7 +1912,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, && src_size.height != surfdesc.Height)) { WARN("Source rect %s is misaligned.\n", wine_dbgstr_rect(src_rect)); - unlock_surface(dst_surface, &lockrect, surface, FALSE); + unlock_surface(dst_surface, dst_rect, &lockrect, surface, FALSE); return D3DXERR_INVALIDDATA; } @@ -1899,7 +1925,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, || !is_conversion_to_supported(destformatdesc)) { FIXME("Unsupported format conversion %#x -> %#x.\n", src_format, surfdesc.Format); - unlock_surface(dst_surface, &lockrect, surface, FALSE); + unlock_surface(dst_surface, dst_rect, &lockrect, surface, FALSE); return E_NOTIMPL; } @@ -1920,7 +1946,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, } } - return unlock_surface(dst_surface, &lockrect, surface, TRUE); + return unlock_surface(dst_surface, dst_rect, &lockrect, surface, TRUE); } /************************************************************ @@ -2004,13 +2030,13 @@ HRESULT WINAPI D3DXLoadSurfaceFromSurface(IDirect3DSurface9 *dst_surface, src_rect = &s; } - if (FAILED(lock_surface(src_surface, &lock, &temp_surface, FALSE))) + if (FAILED(lock_surface(src_surface, NULL, &lock, &temp_surface, FALSE))) return D3DXERR_INVALIDDATA; hr = D3DXLoadSurfaceFromMemory(dst_surface, dst_palette, dst_rect, lock.pBits, src_desc.Format, lock.Pitch, src_palette, src_rect, filter, color_key); - if (FAILED(unlock_surface(src_surface, &lock, temp_surface, FALSE))) + if (FAILED(unlock_surface(src_surface, NULL, &lock, temp_surface, FALSE))) return D3DXERR_INVALIDDATA; return hr; @@ -2186,12 +2212,12 @@ HRESULT WINAPI D3DXSaveSurfaceToFileInMemory(ID3DXBuffer **dst_buffer, D3DXIMAGE TRACE("Using pixel format %s %#x\n", debugstr_guid(&wic_pixel_format), d3d_pixel_format); if (src_surface_desc.Format == d3d_pixel_format) /* Simple copy */ { - if (FAILED(hr = lock_surface(src_surface, &locked_rect, &temp_surface, FALSE))) + if (FAILED(hr = lock_surface(src_surface, src_rect, &locked_rect, &temp_surface, FALSE))) goto cleanup; IWICBitmapFrameEncode_WritePixels(frame, height, locked_rect.Pitch, height * locked_rect.Pitch, locked_rect.pBits); - unlock_surface(src_surface, &locked_rect, temp_surface, FALSE); + unlock_surface(src_surface, src_rect, &locked_rect, temp_surface, FALSE); } else /* Pixel format conversion */ { @@ -2221,14 +2247,14 @@ HRESULT WINAPI D3DXSaveSurfaceToFileInMemory(ID3DXBuffer **dst_buffer, D3DXIMAGE hr = E_OUTOFMEMORY; goto cleanup; } - if (FAILED(hr = lock_surface(src_surface, &locked_rect, &temp_surface, FALSE))) + if (FAILED(hr = lock_surface(src_surface, src_rect, &locked_rect, &temp_surface, FALSE))) { HeapFree(GetProcessHeap(), 0, dst_data); goto cleanup; } convert_argb_pixels(locked_rect.pBits, locked_rect.Pitch, 0, &size, src_format_desc, dst_data, dst_pitch, 0, &size, dst_format_desc, 0, NULL); - unlock_surface(src_surface, &locked_rect, temp_surface, FALSE); + unlock_surface(src_surface, src_rect, &locked_rect, temp_surface, FALSE); IWICBitmapFrameEncode_WritePixels(frame, height, dst_pitch, dst_pitch * height, dst_data); HeapFree(GetProcessHeap(), 0, dst_data); diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 56b79d80cb..a43072ff1f 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -957,17 +957,34 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) check_pixel_4bpp(&lockrect, 1, 1, 0xfffe9aff); IDirect3DSurface9_UnlockRect(surf); - hr = D3DXLoadSurfaceFromMemory(surf, NULL, NULL, pixdata_a8b8g8r8, D3DFMT_A8B8G8R8, 8, NULL, &rect, D3DX_FILTER_NONE, 0); - ok(hr == D3D_OK, "D3DXLoadSurfaceFromMemory returned %#x, expected %#x\n", hr, D3D_OK); - IDirect3DSurface9_LockRect(surf, &lockrect, NULL, D3DLOCK_READONLY); + hr = D3DXLoadSurfaceFromMemory(surf, NULL, NULL, pixdata_a8b8g8r8, D3DFMT_A8B8G8R8, + 8, NULL, &rect, D3DX_FILTER_NONE, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DSurface9_LockRect(surf, &lockrect, NULL, D3DLOCK_READONLY); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); check_pixel_4bpp(&lockrect, 0, 0, 0xc3f04c39); check_pixel_4bpp(&lockrect, 1, 0, 0x2392e85a); check_pixel_4bpp(&lockrect, 0, 1, 0x09fd97b1); check_pixel_4bpp(&lockrect, 1, 1, 0x8df62bc3); IDirect3DSurface9_UnlockRect(surf); - hr = D3DXLoadSurfaceFromMemory(surf, NULL, NULL, pixdata_a2r10g10b10, D3DFMT_A2R10G10B10, 8, NULL, &rect, D3DX_FILTER_NONE, 0); - ok(hr == D3D_OK, "D3DXLoadSurfaceFromMemory returned %#x, expected %#x\n", hr, D3D_OK); + SetRect(&rect, 0, 0, 1, 1); + SetRect(&destrect, 1, 1, 2, 2); + hr = D3DXLoadSurfaceFromMemory(surf, NULL, &destrect, pixdata_a8b8g8r8, D3DFMT_A8B8G8R8, + 8, NULL, &rect, D3DX_FILTER_NONE, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + IDirect3DSurface9_LockRect(surf, &lockrect, NULL, D3DLOCK_READONLY); + check_pixel_4bpp(&lockrect, 0, 0, 0xc3f04c39); + check_pixel_4bpp(&lockrect, 1, 0, 0x2392e85a); + check_pixel_4bpp(&lockrect, 0, 1, 0x09fd97b1); + check_pixel_4bpp(&lockrect, 1, 1, 0xc3f04c39); + IDirect3DSurface9_UnlockRect(surf); + + SetRect(&rect, 0, 0, 2, 2); + + hr = D3DXLoadSurfaceFromMemory(surf, NULL, NULL, pixdata_a2r10g10b10, D3DFMT_A2R10G10B10, + 8, NULL, &rect, D3DX_FILTER_NONE, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); IDirect3DSurface9_LockRect(surf, &lockrect, NULL, D3DLOCK_READONLY); check_pixel_4bpp(&lockrect, 0, 0, 0x555c95bf); check_pixel_4bpp(&lockrect, 1, 0, 0x556d663f); @@ -1386,98 +1403,121 @@ static void test_D3DXSaveSurfaceToFileInMemory(IDirect3DDevice9 *device) static void test_D3DXSaveSurfaceToFile(IDirect3DDevice9 *device) { - HRESULT hr; + const BYTE pixels[] = + {0xff, 0x00, 0x00, 0x00, 0xff, 0x00, + 0x00, 0x00, 0xff, 0x00, 0x00, 0xff,}; + DWORD pitch = sizeof(pixels) / 2; IDirect3DSurface9 *surface; - RECT rect; - D3DLOCKED_RECT lock_rect; D3DXIMAGE_INFO image_info; - const BYTE pixels[] = { 0xff, 0x00, 0x00, 0x00, 0xff, 0x00, - 0x00, 0x00, 0xff, 0x00, 0x00, 0xff }; - DWORD pitch = sizeof(pixels) / 2; + D3DLOCKED_RECT lock_rect; + HRESULT hr; + RECT rect; hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 2, 2, D3DFMT_R8G8B8, D3DPOOL_SCRATCH, &surface, NULL); - if (FAILED(hr)) { - skip("Couldn't create surface\n"); + if (FAILED(hr)) + { + skip("Couldn't create surface.\n"); return; } SetRect(&rect, 0, 0, 2, 2); - hr = D3DXLoadSurfaceFromMemory(surface, NULL, NULL, pixels, D3DFMT_R8G8B8, pitch, NULL, &rect, D3DX_FILTER_NONE, 0); - if (SUCCEEDED(hr)) { - hr = D3DXSaveSurfaceToFileA("saved_surface.bmp", D3DXIFF_BMP, surface, NULL, NULL); - ok(hr == D3D_OK, "D3DXSaveSurfaceToFileA returned %#x, expected %#x\n", hr, D3D_OK); + hr = D3DXLoadSurfaceFromMemory(surface, NULL, NULL, pixels, D3DFMT_R8G8B8, + pitch, NULL, &rect, D3DX_FILTER_NONE, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = D3DXLoadSurfaceFromFileA(surface, NULL, NULL, "saved_surface.bmp", NULL, D3DX_FILTER_NONE, 0, &image_info); - ok(hr == D3D_OK, "Couldn't load saved surface %#x\n", hr); - if (FAILED(hr)) goto next_tests; + hr = D3DXSaveSurfaceToFileA("saved_surface.bmp", D3DXIFF_BMP, surface, NULL, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - ok(image_info.Width == 2, "Wrong width %u\n", image_info.Width); - ok(image_info.Height == 2, "Wrong height %u\n", image_info.Height); - ok(image_info.Format == D3DFMT_R8G8B8, "Wrong format %#x\n", image_info.Format); - ok(image_info.ImageFileFormat == D3DXIFF_BMP, "Wrong file format %u\n", image_info.ImageFileFormat); + hr = D3DXLoadSurfaceFromFileA(surface, NULL, NULL, "saved_surface.bmp", + NULL, D3DX_FILTER_NONE, 0, &image_info); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DSurface9_LockRect(surface, &lock_rect, NULL, D3DLOCK_READONLY); - ok(hr == D3D_OK, "Couldn't lock surface %#x\n", hr); - if (FAILED(hr)) goto next_tests; + ok(image_info.Width == 2, "Wrong width %u.\n", image_info.Width); + ok(image_info.Height == 2, "Wrong height %u.\n", image_info.Height); + ok(image_info.Format == D3DFMT_R8G8B8, "Wrong format %#x.\n", image_info.Format); + ok(image_info.ImageFileFormat == D3DXIFF_BMP, "Wrong file format %u.\n", image_info.ImageFileFormat); - ok(!memcmp(lock_rect.pBits, pixels, pitch), "Pixel data mismatch in first row\n"); - ok(!memcmp((BYTE *)lock_rect.pBits + lock_rect.Pitch, pixels + pitch, pitch), "Pixel data mismatch in second row\n"); + hr = IDirect3DSurface9_LockRect(surface, &lock_rect, NULL, D3DLOCK_READONLY); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + ok(!memcmp(lock_rect.pBits, pixels, pitch), + "Pixel data mismatch in the first row.\n"); + ok(!memcmp((BYTE *)lock_rect.pBits + lock_rect.Pitch, pixels + pitch, pitch), + "Pixel data mismatch in the second row.\n"); - IDirect3DSurface9_UnlockRect(surface); - } else skip("Couldn't fill surface\n"); + IDirect3DSurface9_UnlockRect(surface); + + SetRect(&rect, 0, 1, 2, 2); + hr = D3DXSaveSurfaceToFileA("saved_surface.bmp", D3DXIFF_BMP, surface, NULL, &rect); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + SetRect(&rect, 0, 0, 2, 1); + hr = D3DXLoadSurfaceFromFileA(surface, NULL, &rect, "saved_surface.bmp", NULL, + D3DX_FILTER_NONE, 0, &image_info); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DSurface9_LockRect(surface, &lock_rect, NULL, D3DLOCK_READONLY); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(!memcmp(lock_rect.pBits, pixels + pitch, pitch), + "Pixel data mismatch in the first row.\n"); + ok(!memcmp((BYTE *)lock_rect.pBits + lock_rect.Pitch, pixels + pitch, pitch), + "Pixel data mismatch in the second row.\n"); + IDirect3DSurface9_UnlockRect(surface); + + SetRect(&rect, 0, 0, 2, 2); + hr = D3DXLoadSurfaceFromMemory(surface, NULL, NULL, pixels, D3DFMT_R8G8B8, + pitch, NULL, &rect, D3DX_FILTER_NONE, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); -next_tests: hr = D3DXSaveSurfaceToFileA(NULL, D3DXIFF_BMP, surface, NULL, NULL); - ok(hr == D3DERR_INVALIDCALL, "D3DXSaveSurfaceToFileA returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); /* PPM and TGA are supported, even though MSDN claims they aren't */ - todo_wine { - hr = D3DXSaveSurfaceToFileA("saved_surface.ppm", D3DXIFF_PPM, surface, NULL, NULL); - ok(hr == D3D_OK, "D3DXSaveSurfaceToFileA returned %#x, expected %#x\n", hr, D3D_OK); - hr = D3DXSaveSurfaceToFileA("saved_surface.tga", D3DXIFF_TGA, surface, NULL, NULL); - ok(hr == D3D_OK, "D3DXSaveSurfaceToFileA returned %#x, expected %#x\n", hr, D3D_OK); + todo_wine + { + hr = D3DXSaveSurfaceToFileA("saved_surface.ppm", D3DXIFF_PPM, surface, NULL, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = D3DXSaveSurfaceToFileA("saved_surface.tga", D3DXIFF_TGA, surface, NULL, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); } hr = D3DXSaveSurfaceToFileA("saved_surface.dds", D3DXIFF_DDS, surface, NULL, NULL); - ok(hr == D3D_OK, "D3DXSaveSurfaceToFileA returned %#x, expected %#x\n", hr, D3D_OK); - if (SUCCEEDED(hr)) { - hr = D3DXLoadSurfaceFromFileA(surface, NULL, NULL, "saved_surface.dds", NULL, D3DX_FILTER_NONE, 0, &image_info); - ok(hr == D3D_OK, "Couldn't load saved surface %#x\n", hr); - - if (SUCCEEDED(hr)) { - ok(image_info.Width == 2, "Wrong width %u\n", image_info.Width); - ok(image_info.Format == D3DFMT_R8G8B8, "Wrong format %#x\n", image_info.Format); - ok(image_info.ImageFileFormat == D3DXIFF_DDS, "Wrong file format %u\n", image_info.ImageFileFormat); - - hr = IDirect3DSurface9_LockRect(surface, &lock_rect, NULL, D3DLOCK_READONLY); - ok(hr == D3D_OK, "Couldn't lock surface %#x\n", hr); - if (SUCCEEDED(hr)) { - ok(!memcmp(lock_rect.pBits, pixels, pitch), "Pixel data mismatch in first row\n"); - ok(!memcmp((BYTE *)lock_rect.pBits + lock_rect.Pitch, pixels + pitch, pitch), "Pixel data mismatch in second row\n"); - IDirect3DSurface9_UnlockRect(surface); - } - } - } else skip("Couldn't save surface\n"); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = D3DXLoadSurfaceFromFileA(surface, NULL, NULL, "saved_surface.dds", + NULL, D3DX_FILTER_NONE, 0, &image_info); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + ok(image_info.Width == 2, "Wrong width %u.\n", image_info.Width); + ok(image_info.Format == D3DFMT_R8G8B8, "Wrong format %#x.\n", image_info.Format); + ok(image_info.ImageFileFormat == D3DXIFF_DDS, "Wrong file format %u.\n", image_info.ImageFileFormat); + + hr = IDirect3DSurface9_LockRect(surface, &lock_rect, NULL, D3DLOCK_READONLY); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(!memcmp(lock_rect.pBits, pixels, pitch), + "Pixel data mismatch in the first row.\n"); + ok(!memcmp((BYTE *)lock_rect.pBits + lock_rect.Pitch, pixels + pitch, pitch), + "Pixel data mismatch in the second row.\n"); + IDirect3DSurface9_UnlockRect(surface); hr = D3DXSaveSurfaceToFileA("saved_surface", D3DXIFF_PFM + 1, surface, NULL, NULL); - ok(hr == D3DERR_INVALIDCALL, "D3DXSaveSurfaceToFileA returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); SetRect(&rect, 0, 0, 4, 4); hr = D3DXSaveSurfaceToFileA("saved_surface.bmp", D3DXIFF_BMP, surface, NULL, &rect); - ok(hr == D3DERR_INVALIDCALL, "D3DXSaveSurfaceToFileA returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); SetRect(&rect, 2, 0, 1, 4); hr = D3DXSaveSurfaceToFileA("saved_surface.bmp", D3DXIFF_BMP, surface, NULL, &rect); - ok(hr == D3DERR_INVALIDCALL, "D3DXSaveSurfaceToFileA returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); SetRect(&rect, 0, 2, 4, 1); hr = D3DXSaveSurfaceToFileA("saved_surface.bmp", D3DXIFF_BMP, surface, NULL, &rect); - ok(hr == D3DERR_INVALIDCALL, "D3DXSaveSurfaceToFileA returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); SetRect(&rect, -1, -1, 2, 2); hr = D3DXSaveSurfaceToFileA("saved_surface.bmp", D3DXIFF_BMP, surface, NULL, &rect); - ok(hr == D3DERR_INVALIDCALL, "D3DXSaveSurfaceToFileA returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); SetRectEmpty(&rect); hr = D3DXSaveSurfaceToFileA("saved_surface.bmp", D3DXIFF_BMP, surface, NULL, &rect); /* fails when debug version of d3d9 is used */ - ok(hr == D3D_OK || broken(hr == D3DERR_INVALIDCALL), "D3DXSaveSurfaceToFileA returned %#x, expected %#x\n", hr, D3D_OK); + ok(hr == D3D_OK || broken(hr == D3DERR_INVALIDCALL), "Got unexpected hr %#x.\n", hr); DeleteFileA("saved_surface.bmp"); DeleteFileA("saved_surface.ppm"); diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 1261c35558..74a32b46be 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -1353,7 +1353,7 @@ HRESULT WINAPI D3DXFillTexture(struct IDirect3DTexture9 *texture, LPD3DXFILL2D f if (FAILED(hr = IDirect3DTexture9_GetSurfaceLevel(texture, m, &surface))) return hr; - if (FAILED(hr = lock_surface(surface, &lock_rect, &temp_surface, TRUE))) + if (FAILED(hr = lock_surface(surface, NULL, &lock_rect, &temp_surface, TRUE))) { IDirect3DSurface9_Release(surface); return hr; @@ -1379,7 +1379,7 @@ HRESULT WINAPI D3DXFillTexture(struct IDirect3DTexture9 *texture, LPD3DXFILL2D f fill_texture(format, data + y * lock_rect.Pitch + x * format->bytes_per_pixel, &value); } } - if (FAILED(hr = unlock_surface(surface, &lock_rect, temp_surface, TRUE))) + if (FAILED(hr = unlock_surface(surface, NULL, &lock_rect, temp_surface, TRUE))) { IDirect3DSurface9_Release(surface); return hr; -- 2.21.0

2 1

[PATCH 2/2] winegcc: Always use -nostartfiles when building DLLs.
by Jacek Caban 05 Aug '19

05 Aug '19

So that simplified DllMainCRTStartup version from winecrt0 is used instead of mingw crt. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/winegcc/winegcc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

2 4

[PATCH 1/4] qcap: Share source with strmbase.
by Zebediah Figura 05 Aug '19

05 Aug '19

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/qcap/Makefile.in | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/qcap/Makefile.in b/dlls/qcap/Makefile.in index e161e066bde..12cc9171fb5 100644 --- a/dlls/qcap/Makefile.in +++ b/dlls/qcap/Makefile.in @@ -1,13 +1,19 @@ MODULE = qcap.dll -IMPORTS = strmiids strmbase uuid ole32 oleaut32 gdi32 advapi32 +IMPORTS = strmiids uuid ole32 oleaut32 gdi32 advapi32 DELAYIMPORTS = msvfw32 +PARENTSRC = ../strmbase C_SRCS = \ audiorecord.c \ avico.c \ avimux.c \ capturegraph.c \ + dllfunc.c \ enummedia.c \ + enumpins.c \ + filter.c \ + mediatype.c \ + pin.c \ qcap_main.c \ smartteefilter.c \ v4l.c \ -- 2.20.1

1 3