[PATCH 4/5] wined3d: Make some wined3d_device functions static.
Zebediah Figura
z.figura12 at gmail.com
Tue Mar 3 17:50:05 CST 2020
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
dlls/wined3d/device.c | 58 +++++++++++++--------------------------
dlls/wined3d/wined3d.spec | 16 -----------
include/wine/wined3d.h | 28 -------------------
3 files changed, 19 insertions(+), 83 deletions(-)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 4c9f858c95..118c99e7f5 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -1314,7 +1314,7 @@ HRESULT CDECL wined3d_device_get_stream_source(const struct wined3d_device *devi
return WINED3D_OK;
}
-HRESULT CDECL wined3d_device_set_stream_source_freq(struct wined3d_device *device, UINT stream_idx, UINT divider)
+static void wined3d_device_set_stream_source_freq(struct wined3d_device *device, UINT stream_idx, UINT divider)
{
struct wined3d_stream_state *stream;
UINT old_flags, old_freq;
@@ -1329,11 +1329,9 @@ HRESULT CDECL wined3d_device_set_stream_source_freq(struct wined3d_device *devic
stream->frequency = divider & 0x7fffff;
if (stream->frequency != old_freq || stream->flags != old_flags)
wined3d_cs_emit_set_stream_source_freq(device->cs, stream_idx, stream->frequency, stream->flags);
-
- return WINED3D_OK;
}
-void CDECL wined3d_device_set_transform(struct wined3d_device *device,
+static void wined3d_device_set_transform(struct wined3d_device *device,
enum wined3d_transform_state d3dts, const struct wined3d_matrix *matrix)
{
TRACE("device %p, state %s, matrix %p.\n",
@@ -1359,7 +1357,7 @@ void CDECL wined3d_device_set_transform(struct wined3d_device *device,
wined3d_cs_emit_set_transform(device->cs, d3dts, matrix);
}
-void CDECL wined3d_device_get_transform(const struct wined3d_device *device,
+static void wined3d_device_get_transform(const struct wined3d_device *device,
enum wined3d_transform_state state, struct wined3d_matrix *matrix)
{
TRACE("device %p, state %s, matrix %p.\n", device, debug_d3dtstype(state), matrix);
@@ -1374,7 +1372,7 @@ void CDECL wined3d_device_get_transform(const struct wined3d_device *device,
* stateblock problems. When capturing the state block, I duplicate the
* hashmap, but when recording, just build a chain pretty much of commands to
* be replayed. */
-HRESULT CDECL wined3d_device_set_light(struct wined3d_device *device,
+static void wined3d_device_set_light(struct wined3d_device *device,
UINT light_idx, const struct wined3d_light *light)
{
struct wined3d_light_info *object = NULL;
@@ -1472,11 +1470,9 @@ HRESULT CDECL wined3d_device_set_light(struct wined3d_device *device,
}
wined3d_cs_emit_set_light(device->cs, object);
-
- return WINED3D_OK;
}
-HRESULT CDECL wined3d_device_set_light_enable(struct wined3d_device *device, UINT light_idx, BOOL enable)
+static void wined3d_device_set_light_enable(struct wined3d_device *device, UINT light_idx, BOOL enable)
{
struct wined3d_light_info *light_info;
@@ -1491,17 +1487,15 @@ HRESULT CDECL wined3d_device_set_light_enable(struct wined3d_device *device, UIN
if (!(light_info = wined3d_light_state_get_light(&device->state.light_state, light_idx)))
{
FIXME("Adding default lights has failed dismally\n");
- return WINED3DERR_INVALIDCALL;
+ return;
}
}
wined3d_light_state_enable_light(&device->state.light_state, &device->adapter->d3d_info, light_info, enable);
wined3d_cs_emit_set_light_enable(device->cs, light_idx, enable);
-
- return WINED3D_OK;
}
-HRESULT CDECL wined3d_device_set_clip_plane(struct wined3d_device *device,
+static void wined3d_device_set_clip_plane(struct wined3d_device *device,
UINT plane_idx, const struct wined3d_vec4 *plane)
{
TRACE("device %p, plane_idx %u, plane %p.\n", device, plane_idx, plane);
@@ -1509,20 +1503,18 @@ HRESULT CDECL wined3d_device_set_clip_plane(struct wined3d_device *device,
if (plane_idx >= device->adapter->d3d_info.limits.max_clip_distances)
{
TRACE("Application has requested clipplane this device doesn't support.\n");
- return WINED3DERR_INVALIDCALL;
+ return;
}
if (!memcmp(&device->state.clip_planes[plane_idx], plane, sizeof(*plane)))
{
TRACE("Application is setting old values over, nothing to do.\n");
- return WINED3D_OK;
+ return;
}
device->state.clip_planes[plane_idx] = *plane;
wined3d_cs_emit_set_clip_plane(device->cs, plane_idx, plane);
-
- return WINED3D_OK;
}
HRESULT CDECL wined3d_device_set_clip_status(struct wined3d_device *device,
@@ -1547,7 +1539,7 @@ HRESULT CDECL wined3d_device_get_clip_status(const struct wined3d_device *device
return WINED3D_OK;
}
-void CDECL wined3d_device_set_material(struct wined3d_device *device, const struct wined3d_material *material)
+static void wined3d_device_set_material(struct wined3d_device *device, const struct wined3d_material *material)
{
TRACE("device %p, material %p.\n", device, material);
@@ -1746,7 +1738,7 @@ DWORD CDECL wined3d_device_get_render_state(const struct wined3d_device *device,
return device->state.render_states[state];
}
-void CDECL wined3d_device_set_sampler_state(struct wined3d_device *device,
+static void wined3d_device_set_sampler_state(struct wined3d_device *device,
UINT sampler_idx, enum wined3d_sampler_state state, DWORD value)
{
TRACE("device %p, sampler_idx %u, state %s, value %#x.\n",
@@ -2007,7 +1999,7 @@ struct wined3d_sampler * CDECL wined3d_device_get_vs_sampler(const struct wined3
return wined3d_device_get_sampler(device, WINED3D_SHADER_TYPE_VERTEX, idx);
}
-HRESULT CDECL wined3d_device_set_vs_consts_b(struct wined3d_device *device,
+static void wined3d_device_set_vs_consts_b(struct wined3d_device *device,
unsigned int start_idx, unsigned int count, const BOOL *constants)
{
unsigned int i;
@@ -2023,11 +2015,9 @@ HRESULT CDECL wined3d_device_set_vs_consts_b(struct wined3d_device *device,
}
wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_VS_B, start_idx, count, constants);
-
- return WINED3D_OK;
}
-HRESULT CDECL wined3d_device_set_vs_consts_i(struct wined3d_device *device,
+static void wined3d_device_set_vs_consts_i(struct wined3d_device *device,
unsigned int start_idx, unsigned int count, const struct wined3d_ivec4 *constants)
{
unsigned int i;
@@ -2043,11 +2033,9 @@ HRESULT CDECL wined3d_device_set_vs_consts_i(struct wined3d_device *device,
}
wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_VS_I, start_idx, count, constants);
-
- return WINED3D_OK;
}
-HRESULT CDECL wined3d_device_set_vs_consts_f(struct wined3d_device *device,
+static void wined3d_device_set_vs_consts_f(struct wined3d_device *device,
unsigned int start_idx, unsigned int count, const struct wined3d_vec4 *constants)
{
unsigned int i;
@@ -2063,8 +2051,6 @@ HRESULT CDECL wined3d_device_set_vs_consts_f(struct wined3d_device *device,
}
wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_VS_F, start_idx, count, constants);
-
- return WINED3D_OK;
}
void CDECL wined3d_device_set_pixel_shader(struct wined3d_device *device, struct wined3d_shader *shader)
@@ -2121,7 +2107,7 @@ struct wined3d_sampler * CDECL wined3d_device_get_ps_sampler(const struct wined3
return wined3d_device_get_sampler(device, WINED3D_SHADER_TYPE_PIXEL, idx);
}
-HRESULT CDECL wined3d_device_set_ps_consts_b(struct wined3d_device *device,
+static void wined3d_device_set_ps_consts_b(struct wined3d_device *device,
unsigned int start_idx, unsigned int count, const BOOL *constants)
{
unsigned int i;
@@ -2137,11 +2123,9 @@ HRESULT CDECL wined3d_device_set_ps_consts_b(struct wined3d_device *device,
}
wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_PS_B, start_idx, count, constants);
-
- return WINED3D_OK;
}
-HRESULT CDECL wined3d_device_set_ps_consts_i(struct wined3d_device *device,
+static void wined3d_device_set_ps_consts_i(struct wined3d_device *device,
unsigned int start_idx, unsigned int count, const struct wined3d_ivec4 *constants)
{
unsigned int i;
@@ -2157,11 +2141,9 @@ HRESULT CDECL wined3d_device_set_ps_consts_i(struct wined3d_device *device,
}
wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_PS_I, start_idx, count, constants);
-
- return WINED3D_OK;
}
-HRESULT CDECL wined3d_device_set_ps_consts_f(struct wined3d_device *device,
+static void wined3d_device_set_ps_consts_f(struct wined3d_device *device,
unsigned int start_idx, unsigned int count, const struct wined3d_vec4 *constants)
{
unsigned int i;
@@ -2177,8 +2159,6 @@ HRESULT CDECL wined3d_device_set_ps_consts_f(struct wined3d_device *device,
}
wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_PS_F, start_idx, count, constants);
-
- return WINED3D_OK;
}
void CDECL wined3d_device_set_hull_shader(struct wined3d_device *device, struct wined3d_shader *shader)
@@ -3425,7 +3405,7 @@ HRESULT CDECL wined3d_device_process_vertices(struct wined3d_device *device,
return hr;
}
-void CDECL wined3d_device_set_texture_stage_state(struct wined3d_device *device,
+static void wined3d_device_set_texture_stage_state(struct wined3d_device *device,
UINT stage, enum wined3d_texture_stage_state state, DWORD value)
{
const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info;
@@ -3451,7 +3431,7 @@ void CDECL wined3d_device_set_texture_stage_state(struct wined3d_device *device,
wined3d_cs_emit_set_texture_state(device->cs, stage, state, value);
}
-void CDECL wined3d_device_set_texture(struct wined3d_device *device,
+static void wined3d_device_set_texture(struct wined3d_device *device,
UINT stage, struct wined3d_texture *texture)
{
struct wined3d_texture *prev;
diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec
index c891c44608..05aa53dea0 100644
--- a/dlls/wined3d/wined3d.spec
+++ b/dlls/wined3d/wined3d.spec
@@ -101,7 +101,6 @@
@ cdecl wined3d_device_get_stream_source(ptr long ptr ptr ptr)
@ cdecl wined3d_device_get_swapchain(ptr long)
@ cdecl wined3d_device_get_swapchain_count(ptr)
-@ cdecl wined3d_device_get_transform(ptr long ptr)
@ cdecl wined3d_device_get_unordered_access_view(ptr long)
@ cdecl wined3d_device_get_vertex_declaration(ptr)
@ cdecl wined3d_device_get_vertex_shader(ptr)
@@ -116,7 +115,6 @@
@ cdecl wined3d_device_resolve_sub_resource(ptr ptr long ptr long long)
@ cdecl wined3d_device_set_base_vertex_index(ptr long)
@ cdecl wined3d_device_set_blend_state(ptr ptr ptr)
-@ cdecl wined3d_device_set_clip_plane(ptr long ptr)
@ cdecl wined3d_device_set_clip_status(ptr ptr)
@ cdecl wined3d_device_set_compute_shader(ptr ptr)
@ cdecl wined3d_device_set_constant_buffer(ptr long long ptr)
@@ -138,39 +136,25 @@
@ cdecl wined3d_device_set_hs_sampler(ptr long ptr)
@ cdecl wined3d_device_set_hull_shader(ptr ptr)
@ cdecl wined3d_device_set_index_buffer(ptr ptr long long)
-@ cdecl wined3d_device_set_light(ptr long ptr)
-@ cdecl wined3d_device_set_light_enable(ptr long long)
-@ cdecl wined3d_device_set_material(ptr ptr)
@ cdecl wined3d_device_set_max_frame_latency(ptr long)
@ cdecl wined3d_device_set_multithreaded(ptr)
@ cdecl wined3d_device_set_npatch_mode(ptr float)
@ cdecl wined3d_device_set_pixel_shader(ptr ptr)
@ cdecl wined3d_device_set_predication(ptr ptr long)
@ cdecl wined3d_device_set_primitive_type(ptr long long)
-@ cdecl wined3d_device_set_ps_consts_b(ptr long long ptr)
-@ cdecl wined3d_device_set_ps_consts_f(ptr long long ptr)
-@ cdecl wined3d_device_set_ps_consts_i(ptr long long ptr)
@ cdecl wined3d_device_set_ps_resource_view(ptr long ptr)
@ cdecl wined3d_device_set_ps_sampler(ptr long ptr)
@ cdecl wined3d_device_set_rasterizer_state(ptr ptr)
@ cdecl wined3d_device_set_render_state(ptr long long)
@ cdecl wined3d_device_set_rendertarget_view(ptr long ptr long)
-@ cdecl wined3d_device_set_sampler_state(ptr long long long)
@ cdecl wined3d_device_set_scissor_rects(ptr long ptr)
@ cdecl wined3d_device_set_software_vertex_processing(ptr long)
@ cdecl wined3d_device_set_stream_output(ptr long ptr long)
@ cdecl wined3d_device_set_stream_source(ptr long ptr long long)
-@ cdecl wined3d_device_set_stream_source_freq(ptr long long)
-@ cdecl wined3d_device_set_texture(ptr long ptr)
-@ cdecl wined3d_device_set_texture_stage_state(ptr long long long)
-@ cdecl wined3d_device_set_transform(ptr long ptr)
@ cdecl wined3d_device_set_unordered_access_view(ptr long ptr long)
@ cdecl wined3d_device_set_vertex_declaration(ptr ptr)
@ cdecl wined3d_device_set_vertex_shader(ptr ptr)
@ cdecl wined3d_device_set_viewports(ptr long ptr)
-@ cdecl wined3d_device_set_vs_consts_b(ptr long long ptr)
-@ cdecl wined3d_device_set_vs_consts_f(ptr long long ptr)
-@ cdecl wined3d_device_set_vs_consts_i(ptr long long ptr)
@ cdecl wined3d_device_set_vs_resource_view(ptr long ptr)
@ cdecl wined3d_device_set_vs_sampler(ptr long ptr)
@ cdecl wined3d_device_show_cursor(ptr long)
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index b724424bce..a2a5fb8191 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -2398,8 +2398,6 @@ HRESULT __cdecl wined3d_device_get_stream_source(const struct wined3d_device *de
struct wined3d_swapchain * __cdecl wined3d_device_get_swapchain(const struct wined3d_device *device,
UINT swapchain_idx);
UINT __cdecl wined3d_device_get_swapchain_count(const struct wined3d_device *device);
-void __cdecl wined3d_device_get_transform(const struct wined3d_device *device,
- enum wined3d_transform_state state, struct wined3d_matrix *matrix);
struct wined3d_unordered_access_view * __cdecl wined3d_device_get_unordered_access_view(
const struct wined3d_device *device, unsigned int idx);
struct wined3d_vertex_declaration * __cdecl wined3d_device_get_vertex_declaration(const struct wined3d_device *device);
@@ -2425,8 +2423,6 @@ void __cdecl wined3d_device_resolve_sub_resource(struct wined3d_device *device,
void __cdecl wined3d_device_set_base_vertex_index(struct wined3d_device *device, INT base_index);
void __cdecl wined3d_device_set_blend_state(struct wined3d_device *device, struct wined3d_blend_state *blend_state,
const struct wined3d_color *blend_factor);
-HRESULT __cdecl wined3d_device_set_clip_plane(struct wined3d_device *device,
- UINT plane_idx, const struct wined3d_vec4 *plane);
HRESULT __cdecl wined3d_device_set_clip_status(struct wined3d_device *device,
const struct wined3d_clip_status *clip_status);
void __cdecl wined3d_device_set_compute_shader(struct wined3d_device *device, struct wined3d_shader *shader);
@@ -2463,10 +2459,6 @@ void __cdecl wined3d_device_set_hs_sampler(struct wined3d_device *device,
void __cdecl wined3d_device_set_hull_shader(struct wined3d_device *device, struct wined3d_shader *shader);
void __cdecl wined3d_device_set_index_buffer(struct wined3d_device *device,
struct wined3d_buffer *index_buffer, enum wined3d_format_id format_id, unsigned int offset);
-HRESULT __cdecl wined3d_device_set_light(struct wined3d_device *device,
- UINT light_idx, const struct wined3d_light *light);
-HRESULT __cdecl wined3d_device_set_light_enable(struct wined3d_device *device, UINT light_idx, BOOL enable);
-void __cdecl wined3d_device_set_material(struct wined3d_device *device, const struct wined3d_material *material);
void __cdecl wined3d_device_set_max_frame_latency(struct wined3d_device *device, unsigned int max_frame_latency);
void __cdecl wined3d_device_set_multithreaded(struct wined3d_device *device);
HRESULT __cdecl wined3d_device_set_npatch_mode(struct wined3d_device *device, float segments);
@@ -2475,12 +2467,6 @@ void __cdecl wined3d_device_set_predication(struct wined3d_device *device,
struct wined3d_query *predicate, BOOL value);
void __cdecl wined3d_device_set_primitive_type(struct wined3d_device *device,
enum wined3d_primitive_type primitive_topology, unsigned int patch_vertex_count);
-HRESULT __cdecl wined3d_device_set_ps_consts_b(struct wined3d_device *device,
- unsigned int start_idx, unsigned int count, const BOOL *constants);
-HRESULT __cdecl wined3d_device_set_ps_consts_f(struct wined3d_device *device,
- unsigned int start_idx, unsigned int count, const struct wined3d_vec4 *constants);
-HRESULT __cdecl wined3d_device_set_ps_consts_i(struct wined3d_device *device,
- unsigned int start_idx, unsigned int count, const struct wined3d_ivec4 *constants);
void __cdecl wined3d_device_set_ps_resource_view(struct wined3d_device *device,
UINT idx, struct wined3d_shader_resource_view *view);
void __cdecl wined3d_device_set_ps_sampler(struct wined3d_device *device, UINT idx, struct wined3d_sampler *sampler);
@@ -2490,8 +2476,6 @@ void __cdecl wined3d_device_set_render_state(struct wined3d_device *device,
enum wined3d_render_state state, DWORD value);
HRESULT __cdecl wined3d_device_set_rendertarget_view(struct wined3d_device *device,
unsigned int view_idx, struct wined3d_rendertarget_view *view, BOOL set_viewport);
-void __cdecl wined3d_device_set_sampler_state(struct wined3d_device *device,
- UINT sampler_idx, enum wined3d_sampler_state state, DWORD value);
void __cdecl wined3d_device_set_scissor_rects(struct wined3d_device *device,
unsigned int rect_count, const RECT *rect);
void __cdecl wined3d_device_set_software_vertex_processing(struct wined3d_device *device, BOOL software);
@@ -2499,12 +2483,6 @@ void __cdecl wined3d_device_set_stream_output(struct wined3d_device *device, UIN
struct wined3d_buffer *buffer, UINT offset);
HRESULT __cdecl wined3d_device_set_stream_source(struct wined3d_device *device,
UINT stream_idx, struct wined3d_buffer *buffer, UINT offset, UINT stride);
-HRESULT __cdecl wined3d_device_set_stream_source_freq(struct wined3d_device *device, UINT stream_idx, UINT divider);
-void __cdecl wined3d_device_set_texture(struct wined3d_device *device, UINT stage, struct wined3d_texture *texture);
-void __cdecl wined3d_device_set_texture_stage_state(struct wined3d_device *device,
- UINT stage, enum wined3d_texture_stage_state state, DWORD value);
-void __cdecl wined3d_device_set_transform(struct wined3d_device *device,
- enum wined3d_transform_state state, const struct wined3d_matrix *matrix);
void __cdecl wined3d_device_set_unordered_access_view(struct wined3d_device *device,
unsigned int idx, struct wined3d_unordered_access_view *uav, unsigned int initial_count);
void __cdecl wined3d_device_set_vertex_declaration(struct wined3d_device *device,
@@ -2512,12 +2490,6 @@ void __cdecl wined3d_device_set_vertex_declaration(struct wined3d_device *device
void __cdecl wined3d_device_set_vertex_shader(struct wined3d_device *device, struct wined3d_shader *shader);
void __cdecl wined3d_device_set_viewports(struct wined3d_device *device, unsigned int viewport_count,
const struct wined3d_viewport *viewports);
-HRESULT __cdecl wined3d_device_set_vs_consts_b(struct wined3d_device *device,
- unsigned int start_idx, unsigned int count, const BOOL *constants);
-HRESULT __cdecl wined3d_device_set_vs_consts_f(struct wined3d_device *device,
- unsigned int start_idx, unsigned int count, const struct wined3d_vec4 *constants);
-HRESULT __cdecl wined3d_device_set_vs_consts_i(struct wined3d_device *device,
- unsigned int start_idx, unsigned int count, const struct wined3d_ivec4 *constants);
void __cdecl wined3d_device_set_vs_resource_view(struct wined3d_device *device,
UINT idx, struct wined3d_shader_resource_view *view);
void __cdecl wined3d_device_set_vs_sampler(struct wined3d_device *device, UINT idx, struct wined3d_sampler *sampler);
--
2.25.1
More information about the wine-devel
mailing list