[PATCH 7/7] wined3d: Introduce wined3d_device_context_set_shader().
Zebediah Figura
z.figura12 at gmail.com
Thu Mar 4 21:29:50 CST 2021
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
dlls/wined3d/device.c | 86 ++++++++--------------------------
dlls/wined3d/wined3d.spec | 2 +
dlls/wined3d/wined3d_private.h | 1 -
include/wine/wined3d.h | 4 ++
4 files changed, 25 insertions(+), 68 deletions(-)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index e6ac3621d4e..06329293261 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -2081,25 +2081,33 @@ struct wined3d_vertex_declaration * CDECL wined3d_device_get_vertex_declaration(
return device->cs->c.state->vertex_declaration;
}
-void CDECL wined3d_device_set_vertex_shader(struct wined3d_device *device, struct wined3d_shader *shader)
+void CDECL wined3d_device_context_set_shader(struct wined3d_device_context *context,
+ enum wined3d_shader_type type, struct wined3d_shader *shader)
{
- struct wined3d_state *state = device->cs->c.state;
+ struct wined3d_state *state = context->state;
struct wined3d_shader *prev;
- TRACE("device %p, shader %p.\n", device, shader);
+ TRACE("context %p, type %#x, shader %p.\n", context, type, shader);
- prev = state->shader[WINED3D_SHADER_TYPE_VERTEX];
+ prev = state->shader[type];
if (shader == prev)
return;
if (shader)
wined3d_shader_incref(shader);
- state->shader[WINED3D_SHADER_TYPE_VERTEX] = shader;
- wined3d_device_context_emit_set_shader(&device->cs->c, WINED3D_SHADER_TYPE_VERTEX, shader);
+ state->shader[type] = shader;
+ wined3d_device_context_emit_set_shader(context, type, shader);
if (prev)
wined3d_shader_decref(prev);
}
+void CDECL wined3d_device_set_vertex_shader(struct wined3d_device *device, struct wined3d_shader *shader)
+{
+ TRACE("device %p, shader %p.\n", device, shader);
+
+ return wined3d_device_context_set_shader(&device->cs->c, WINED3D_SHADER_TYPE_VERTEX, shader);
+}
+
struct wined3d_shader * CDECL wined3d_device_get_vertex_shader(const struct wined3d_device *device)
{
TRACE("device %p.\n", device);
@@ -2321,21 +2329,9 @@ static void wined3d_device_set_vs_consts_f(struct wined3d_device *device,
void CDECL wined3d_device_set_pixel_shader(struct wined3d_device *device, struct wined3d_shader *shader)
{
- struct wined3d_state *state = device->cs->c.state;
- struct wined3d_shader *prev;
-
TRACE("device %p, shader %p.\n", device, shader);
- prev = state->shader[WINED3D_SHADER_TYPE_PIXEL];
- if (shader == prev)
- return;
-
- if (shader)
- wined3d_shader_incref(shader);
- state->shader[WINED3D_SHADER_TYPE_PIXEL] = shader;
- wined3d_device_context_emit_set_shader(&device->cs->c, WINED3D_SHADER_TYPE_PIXEL, shader);
- if (prev)
- wined3d_shader_decref(prev);
+ return wined3d_device_context_set_shader(&device->cs->c, WINED3D_SHADER_TYPE_PIXEL, shader);
}
struct wined3d_shader * CDECL wined3d_device_get_pixel_shader(const struct wined3d_device *device)
@@ -2431,20 +2427,9 @@ static void wined3d_device_set_ps_consts_f(struct wined3d_device *device,
void CDECL wined3d_device_set_hull_shader(struct wined3d_device *device, struct wined3d_shader *shader)
{
- struct wined3d_state *state = device->cs->c.state;
- struct wined3d_shader *prev;
-
TRACE("device %p, shader %p.\n", device, shader);
- prev = state->shader[WINED3D_SHADER_TYPE_HULL];
- if (shader == prev)
- return;
- if (shader)
- wined3d_shader_incref(shader);
- state->shader[WINED3D_SHADER_TYPE_HULL] = shader;
- wined3d_device_context_emit_set_shader(&device->cs->c, WINED3D_SHADER_TYPE_HULL, shader);
- if (prev)
- wined3d_shader_decref(prev);
+ return wined3d_device_context_set_shader(&device->cs->c, WINED3D_SHADER_TYPE_HULL, shader);
}
struct wined3d_shader * CDECL wined3d_device_get_hull_shader(const struct wined3d_device *device)
@@ -2487,20 +2472,9 @@ struct wined3d_sampler * CDECL wined3d_device_get_hs_sampler(const struct wined3
void CDECL wined3d_device_set_domain_shader(struct wined3d_device *device, struct wined3d_shader *shader)
{
- struct wined3d_state *state = device->cs->c.state;
- struct wined3d_shader *prev;
-
TRACE("device %p, shader %p.\n", device, shader);
- prev = state->shader[WINED3D_SHADER_TYPE_DOMAIN];
- if (shader == prev)
- return;
- if (shader)
- wined3d_shader_incref(shader);
- state->shader[WINED3D_SHADER_TYPE_DOMAIN] = shader;
- wined3d_device_context_emit_set_shader(&device->cs->c, WINED3D_SHADER_TYPE_DOMAIN, shader);
- if (prev)
- wined3d_shader_decref(prev);
+ return wined3d_device_context_set_shader(&device->cs->c, WINED3D_SHADER_TYPE_DOMAIN, shader);
}
struct wined3d_shader * CDECL wined3d_device_get_domain_shader(const struct wined3d_device *device)
@@ -2543,20 +2517,9 @@ struct wined3d_sampler * CDECL wined3d_device_get_ds_sampler(const struct wined3
void CDECL wined3d_device_set_geometry_shader(struct wined3d_device *device, struct wined3d_shader *shader)
{
- struct wined3d_state *state = device->cs->c.state;
- struct wined3d_shader *prev;
-
TRACE("device %p, shader %p.\n", device, shader);
- prev = state->shader[WINED3D_SHADER_TYPE_GEOMETRY];
- if (shader == prev)
- return;
- if (shader)
- wined3d_shader_incref(shader);
- state->shader[WINED3D_SHADER_TYPE_GEOMETRY] = shader;
- wined3d_device_context_emit_set_shader(&device->cs->c, WINED3D_SHADER_TYPE_GEOMETRY, shader);
- if (prev)
- wined3d_shader_decref(prev);
+ return wined3d_device_context_set_shader(&device->cs->c, WINED3D_SHADER_TYPE_GEOMETRY, shader);
}
struct wined3d_shader * CDECL wined3d_device_get_geometry_shader(const struct wined3d_device *device)
@@ -2598,20 +2561,9 @@ struct wined3d_sampler * CDECL wined3d_device_get_gs_sampler(const struct wined3
void CDECL wined3d_device_set_compute_shader(struct wined3d_device *device, struct wined3d_shader *shader)
{
- struct wined3d_state *state = device->cs->c.state;
- struct wined3d_shader *prev;
-
TRACE("device %p, shader %p.\n", device, shader);
- prev = state->shader[WINED3D_SHADER_TYPE_COMPUTE];
- if (shader == prev)
- return;
- if (shader)
- wined3d_shader_incref(shader);
- state->shader[WINED3D_SHADER_TYPE_COMPUTE] = shader;
- wined3d_device_context_emit_set_shader(&device->cs->c, WINED3D_SHADER_TYPE_COMPUTE, shader);
- if (prev)
- wined3d_shader_decref(prev);
+ return wined3d_device_context_set_shader(&device->cs->c, WINED3D_SHADER_TYPE_COMPUTE, shader);
}
struct wined3d_shader * CDECL wined3d_device_get_compute_shader(const struct wined3d_device *device)
diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec
index 6b6480cec8f..f1d477af703 100644
--- a/dlls/wined3d/wined3d.spec
+++ b/dlls/wined3d/wined3d.spec
@@ -166,6 +166,8 @@
@ cdecl wined3d_device_update_texture(ptr ptr ptr)
@ cdecl wined3d_device_validate_device(ptr ptr)
+@ cdecl wined3d_device_context_set_shader(ptr long ptr)
+
@ cdecl wined3d_output_find_closest_matching_mode(ptr ptr)
@ cdecl wined3d_output_get_adapter(ptr)
@ cdecl wined3d_output_get_desc(ptr ptr)
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index a16da66b309..ee00530981c 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -89,7 +89,6 @@ struct wined3d_adapter;
struct wined3d_buffer_vk;
struct wined3d_context;
struct wined3d_context_vk;
-struct wined3d_device_context;
struct wined3d_gl_info;
struct wined3d_state;
struct wined3d_swapchain_gl;
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index 0d67e8c89d1..030e3fdcb67 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -2214,6 +2214,7 @@ struct wined3d_blend_state;
struct wined3d_buffer;
struct wined3d_depth_stencil_state;
struct wined3d_device;
+struct wined3d_device_context;
struct wined3d_output;
struct wined3d_palette;
struct wined3d_query;
@@ -2547,6 +2548,9 @@ HRESULT __cdecl wined3d_device_update_texture(struct wined3d_device *device,
struct wined3d_texture *src_texture, struct wined3d_texture *dst_texture);
HRESULT __cdecl wined3d_device_validate_device(const struct wined3d_device *device, DWORD *num_passes);
+void __cdecl wined3d_device_context_set_shader(struct wined3d_device_context *context,
+ enum wined3d_shader_type type, struct wined3d_shader *shader);
+
HRESULT __cdecl wined3d_output_find_closest_matching_mode(const struct wined3d_output *output,
struct wined3d_display_mode *mode);
struct wined3d_adapter * __cdecl wined3d_output_get_adapter(const struct wined3d_output *output);
--
2.20.1
More information about the wine-devel
mailing list