[PATCH v2 4/5] wined3d: Pass a wined3d_device_context to wined3d_device_get_blend_state().

Henri Verbeet hverbeet at gmail.com
Thu Apr 15 10:51:10 CDT 2021


On Thu, 15 Apr 2021 at 06:59, Zebediah Figura <z.figura12 at gmail.com> wrote:
> diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec
> index 406e511c0f6..a8f88667a27 100644
> --- a/dlls/wined3d/wined3d.spec
> +++ b/dlls/wined3d/wined3d.spec
> @@ -55,7 +55,6 @@
>  @ cdecl wined3d_device_end_scene(ptr)
>  @ cdecl wined3d_device_evict_managed_resources(ptr)
>  @ cdecl wined3d_device_get_available_texture_mem(ptr)
> -@ cdecl wined3d_device_get_blend_state(ptr ptr)
>  @ cdecl wined3d_device_get_clip_status(ptr ptr)
>  @ cdecl wined3d_device_get_compute_shader(ptr)
>  @ cdecl wined3d_device_get_creation_parameters(ptr ptr)
> @@ -170,6 +169,7 @@
>  @ cdecl wined3d_device_context_dispatch_indirect(ptr ptr long)
>  @ cdecl wined3d_device_context_flush(ptr)
>  @ cdecl wined3d_device_context_generate_mipmaps(ptr ptr)
> +@ cdecl wined3d_device_context_get_blend_state(ptr ptr)
>  @ cdecl wined3d_device_context_get_constant_buffer(ptr long long)
>  @ cdecl wined3d_device_context_get_shader(ptr long)
>  @ cdecl wined3d_device_context_issue_query(ptr ptr long)

That doesn't match the function's prototype. (Neither do the existing
entries for wined3d_device_get_blend_state() and
wined3d_device_set_blend_state(); looks like those slipped through in
commit 21017243b80cfb0ddb370b972e988ca0880b49c2.)

> diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
> index 1a58c671934..5b936017191 100644
> --- a/include/wine/wined3d.h
> +++ b/include/wine/wined3d.h
> @@ -2565,6 +2565,8 @@ void __cdecl wined3d_device_context_draw_indirect(struct wined3d_device_context
>  void __cdecl wined3d_device_context_flush(struct wined3d_device_context *context);
>  void __cdecl wined3d_device_context_generate_mipmaps(struct wined3d_device_context *context,
>          struct wined3d_shader_resource_view *view);
> +struct wined3d_blend_state * __cdecl wined3d_device_context_get_blend_state(
> +        const struct wined3d_device_context *context, struct wined3d_color *blend_factor, unsigned int *sample_mask);
>  struct wined3d_buffer * __cdecl wined3d_device_context_get_constant_buffer(const struct wined3d_device_context *context,
>          enum wined3d_shader_type shader_type, unsigned int idx);
>  struct wined3d_shader * __cdecl wined3d_device_context_get_shader(const struct wined3d_device_context *context,

We should probably remove the wined3d_device_get_blend_state() prototype here.



More information about the wine-devel mailing list