Signed-off-by: Zebediah Figura z.figura12@gmail.com --- dlls/wined3d/device.c | 46 +++++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 21 deletions(-)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a8383a89617..e4f0556fdbc 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -933,16 +933,17 @@ void CDECL wined3d_device_release_focus_window(struct wined3d_device *device) static void device_init_swapchain_state(struct wined3d_device *device, struct wined3d_swapchain *swapchain) { BOOL ds_enable = swapchain->state.desc.enable_auto_depth_stencil; + struct wined3d_device_context *context = &device->cs->c; unsigned int i;
for (i = 0; i < device->adapter->d3d_info.limits.max_rt_count; ++i) { - wined3d_device_set_rendertarget_view(device, i, NULL, FALSE); + wined3d_device_context_set_rendertarget_view(context, i, NULL, FALSE); } if (device->back_buffer_view) - wined3d_device_set_rendertarget_view(device, 0, device->back_buffer_view, TRUE); + wined3d_device_context_set_rendertarget_view(context, 0, device->back_buffer_view, TRUE);
- wined3d_device_set_depth_stencil_view(device, ds_enable ? device->auto_depth_stencil_view : NULL); + wined3d_device_context_set_depth_stencil_view(context, ds_enable ? device->auto_depth_stencil_view : NULL); }
void wined3d_device_delete_opengl_contexts_cs(void *object) @@ -3979,9 +3980,9 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, TRACE("device %p, stateblock %p.\n", device, stateblock);
if (changed->vertexShader) - wined3d_device_set_vertex_shader(device, state->vs); + wined3d_device_context_set_shader(context, WINED3D_SHADER_TYPE_VERTEX, state->vs); if (changed->pixelShader) - wined3d_device_set_pixel_shader(device, state->ps); + wined3d_device_context_set_shader(context, WINED3D_SHADER_TYPE_PIXEL, state->ps);
for (start = 0; ; start = range.offset + range.size) { @@ -4136,12 +4137,12 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, if ((entry = wine_rb_get(&device->rasterizer_states, &desc))) { rasterizer_state = WINE_RB_ENTRY_VALUE(entry, struct wined3d_rasterizer_state, entry); - wined3d_device_set_rasterizer_state(device, rasterizer_state); + wined3d_device_context_set_rasterizer_state(context, rasterizer_state); } else if (SUCCEEDED(wined3d_rasterizer_state_create(device, &desc, NULL, &wined3d_null_parent_ops, &rasterizer_state))) { - wined3d_device_set_rasterizer_state(device, rasterizer_state); + wined3d_device_context_set_rasterizer_state(context, rasterizer_state); if (wine_rb_put(&device->rasterizer_states, &desc, &rasterizer_state->entry) == -1) { ERR("Failed to insert rasterizer state.\n"); @@ -4209,12 +4210,14 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, if ((entry = wine_rb_get(&device->blend_states, &desc))) { blend_state = WINE_RB_ENTRY_VALUE(entry, struct wined3d_blend_state, entry); - wined3d_device_set_blend_state(device, blend_state, &colour, state->rs[WINED3D_RS_MULTISAMPLEMASK]); + wined3d_device_context_set_blend_state(context, blend_state, &colour, + state->rs[WINED3D_RS_MULTISAMPLEMASK]); } else if (SUCCEEDED(wined3d_blend_state_create(device, &desc, NULL, &wined3d_null_parent_ops, &blend_state))) { - wined3d_device_set_blend_state(device, blend_state, &colour, state->rs[WINED3D_RS_MULTISAMPLEMASK]); + wined3d_device_context_set_blend_state(context, blend_state, &colour, + state->rs[WINED3D_RS_MULTISAMPLEMASK]); if (wine_rb_put(&device->blend_states, &desc, &blend_state->entry) == -1) { ERR("Failed to insert blend state.\n"); @@ -4276,12 +4279,12 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, if ((entry = wine_rb_get(&device->depth_stencil_states, &desc))) { depth_stencil_state = WINE_RB_ENTRY_VALUE(entry, struct wined3d_depth_stencil_state, entry); - wined3d_device_set_depth_stencil_state(device, depth_stencil_state, stencil_ref); + wined3d_device_context_set_depth_stencil_state(context, depth_stencil_state, stencil_ref); } else if (SUCCEEDED(wined3d_depth_stencil_state_create(device, &desc, NULL, &wined3d_null_parent_ops, &depth_stencil_state))) { - wined3d_device_set_depth_stencil_state(device, depth_stencil_state, stencil_ref); + wined3d_device_context_set_depth_stencil_state(context, depth_stencil_state, stencil_ref); if (wine_rb_put(&device->depth_stencil_states, &desc, &depth_stencil_state->entry) == -1) { ERR("Failed to insert depth/stencil state.\n"); @@ -4325,22 +4328,22 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, }
if (changed->indices) - wined3d_device_set_index_buffer(device, state->index_buffer, state->index_format, 0); + wined3d_device_context_set_index_buffer(context, state->index_buffer, state->index_format, 0); wined3d_device_set_base_vertex_index(device, state->base_vertex_index); if (changed->vertexDecl) - wined3d_device_set_vertex_declaration(device, state->vertex_declaration); + wined3d_device_context_set_vertex_declaration(context, state->vertex_declaration); if (changed->material) wined3d_device_set_material(device, &state->material); if (changed->viewport) - wined3d_device_set_viewports(device, 1, &state->viewport); + wined3d_device_context_set_viewports(context, 1, &state->viewport); if (changed->scissorRect) - wined3d_device_set_scissor_rects(device, 1, &state->scissor_rect); + wined3d_device_context_set_scissor_rects(context, 1, &state->scissor_rect);
map = changed->streamSource; while (map) { i = wined3d_bit_scan(&map); - wined3d_device_set_stream_source(device, i, state->streams[i].buffer, + wined3d_device_context_set_stream_source(context, i, state->streams[i].buffer, state->streams[i].offset, state->streams[i].stride); } map = changed->streamFreq; @@ -5696,9 +5699,10 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, wined3d_device_reset_cb callback, BOOL reset_state) { const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info; + struct wined3d_device_context *context = &device->cs->c; struct wined3d_swapchain_state *swapchain_state; + struct wined3d_state *state = context->state; struct wined3d_swapchain_desc *current_desc; - struct wined3d_state *state = device->cs->c.state; struct wined3d_resource *resource, *cursor; struct wined3d_rendertarget_view *view; struct wined3d_swapchain *swapchain; @@ -5737,9 +5741,9 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device,
for (i = 0; i < d3d_info->limits.max_rt_count; ++i) { - wined3d_device_set_rendertarget_view(device, i, NULL, FALSE); + wined3d_device_context_set_rendertarget_view(context, i, NULL, FALSE); } - wined3d_device_set_depth_stencil_view(device, NULL); + wined3d_device_context_set_depth_stencil_view(context, NULL);
if (reset_state) { @@ -5961,9 +5965,9 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, else { if ((view = device->back_buffer_view)) - wined3d_device_set_rendertarget_view(device, 0, view, FALSE); + wined3d_device_context_set_rendertarget_view(context, 0, view, FALSE); if ((view = device->auto_depth_stencil_view)) - wined3d_device_set_depth_stencil_view(device, view); + wined3d_device_context_set_depth_stencil_view(context, view); }
if (reset_state)
Signed-off-by: Zebediah Figura z.figura12@gmail.com --- This should have been done as part of earlier patches, but oh well, it's a work in progress...
dlls/wined3d/device.c | 539 +------------------------------------- dlls/wined3d/wined3d.spec | 63 ----- include/wine/wined3d.h | 102 -------- 3 files changed, 1 insertion(+), 703 deletions(-)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e4f0556fdbc..b62b07fd51e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1235,14 +1235,6 @@ UINT CDECL wined3d_device_get_available_texture_mem(const struct wined3d_device return min(UINT_MAX, driver_info->vram_bytes - device->adapter->vram_bytes_used); }
-void CDECL wined3d_device_set_stream_output(struct wined3d_device *device, UINT idx, - struct wined3d_buffer *buffer, UINT offset) -{ - TRACE("device %p, idx %u, buffer %p, offset %u.\n", device, idx, buffer, offset); - - wined3d_device_context_set_stream_output(&device->cs->c, idx, buffer, offset); -} - struct wined3d_buffer * CDECL wined3d_device_context_get_stream_output(struct wined3d_device_context *context, unsigned int idx, unsigned int *offset) { @@ -1259,15 +1251,6 @@ struct wined3d_buffer * CDECL wined3d_device_context_get_stream_output(struct wi return context->state->stream_output[idx].buffer; }
-HRESULT CDECL wined3d_device_set_stream_source(struct wined3d_device *device, UINT stream_idx, - struct wined3d_buffer *buffer, UINT offset, UINT stride) -{ - TRACE("device %p, stream_idx %u, buffer %p, offset %u, stride %u.\n", - device, stream_idx, buffer, offset, stride); - - return wined3d_device_context_set_stream_source(&device->cs->c, stream_idx, buffer, offset, stride); -} - HRESULT CDECL wined3d_device_context_get_stream_source(const struct wined3d_device_context *context, unsigned int stream_idx, struct wined3d_buffer **buffer, unsigned int *offset, unsigned int *stride) { @@ -1527,15 +1510,6 @@ static void wined3d_device_set_material(struct wined3d_device *device, const str wined3d_device_context_emit_set_material(&device->cs->c, material); }
-void CDECL wined3d_device_set_index_buffer(struct wined3d_device *device, - struct wined3d_buffer *buffer, enum wined3d_format_id format_id, unsigned int offset) -{ - TRACE("device %p, buffer %p, format %s, offset %u.\n", - device, buffer, debug_d3dformat(format_id), offset); - - wined3d_device_context_set_index_buffer(&device->cs->c, buffer, format_id, offset); -} - struct wined3d_buffer * CDECL wined3d_device_context_get_index_buffer(const struct wined3d_device_context *context, enum wined3d_format_id *format, unsigned int *offset) { @@ -1549,29 +1523,13 @@ struct wined3d_buffer * CDECL wined3d_device_context_get_index_buffer(const stru return state->index_buffer; }
-void CDECL wined3d_device_set_base_vertex_index(struct wined3d_device *device, INT base_index) +static void wined3d_device_set_base_vertex_index(struct wined3d_device *device, int base_index) { TRACE("device %p, base_index %d.\n", device, base_index);
device->cs->c.state->base_vertex_index = base_index; }
-void CDECL wined3d_device_set_viewports(struct wined3d_device *device, unsigned int viewport_count, - const struct wined3d_viewport *viewports) -{ - unsigned int i; - - TRACE("device %p, viewport_count %u, viewports %p.\n", device, viewport_count, viewports); - - for (i = 0; i < viewport_count; ++i) - { - TRACE("%u: x %.8e, y %.8e, w %.8e, h %.8e, min_z %.8e, max_z %.8e.\n", i, viewports[i].x, viewports[i].y, - viewports[i].width, viewports[i].height, viewports[i].min_z, viewports[i].max_z); - } - - wined3d_device_context_set_viewports(&device->cs->c, viewport_count, viewports); -} - void CDECL wined3d_device_context_get_viewports(const struct wined3d_device_context *context, unsigned int *viewport_count, struct wined3d_viewport *viewports) { @@ -1606,15 +1564,6 @@ static void resolve_depth_buffer(struct wined3d_device *device) src_view->resource, src_view->sub_resource_idx, dst_resource->format->id); }
-void CDECL wined3d_device_set_blend_state(struct wined3d_device *device, - struct wined3d_blend_state *blend_state, const struct wined3d_color *blend_factor, unsigned int sample_mask) -{ - TRACE("device %p, blend_state %p, blend_factor %s, sample_mask %#x.\n", - device, blend_state, debug_color(blend_factor), sample_mask); - - wined3d_device_context_set_blend_state(&device->cs->c, blend_state, blend_factor, sample_mask); -} - 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) { @@ -1627,14 +1576,6 @@ struct wined3d_blend_state * CDECL wined3d_device_context_get_blend_state(const return state->blend_state; }
-void CDECL wined3d_device_set_depth_stencil_state(struct wined3d_device *device, - struct wined3d_depth_stencil_state *depth_stencil_state, unsigned int stencil_ref) -{ - TRACE("device %p, depth_stencil_state %p, stencil_ref %u.\n", device, depth_stencil_state, stencil_ref); - - wined3d_device_context_set_depth_stencil_state(&device->cs->c, depth_stencil_state, stencil_ref); -} - struct wined3d_depth_stencil_state * CDECL wined3d_device_context_get_depth_stencil_state( const struct wined3d_device_context *context, unsigned int *stencil_ref) { @@ -1646,14 +1587,6 @@ struct wined3d_depth_stencil_state * CDECL wined3d_device_context_get_depth_sten return state->depth_stencil_state; }
-void CDECL wined3d_device_set_rasterizer_state(struct wined3d_device *device, - struct wined3d_rasterizer_state *rasterizer_state) -{ - TRACE("device %p, rasterizer_state %p.\n", device, rasterizer_state); - - wined3d_device_context_set_rasterizer_state(&device->cs->c, rasterizer_state); -} - struct wined3d_rasterizer_state * CDECL wined3d_device_context_get_rasterizer_state( struct wined3d_device_context *context) { @@ -1686,13 +1619,6 @@ static void wined3d_device_set_render_state(struct wined3d_device *device, } }
-DWORD CDECL wined3d_device_get_render_state(const struct wined3d_device *device, enum wined3d_render_state state) -{ - TRACE("device %p, state %s (%#x).\n", device, debug_d3drenderstate(state), state); - - return device->cs->c.state->render_states[state]; -} - static void wined3d_device_set_sampler_state(struct wined3d_device *device, UINT sampler_idx, enum wined3d_sampler_state state, DWORD value) { @@ -1709,21 +1635,6 @@ static void wined3d_device_set_sampler_state(struct wined3d_device *device, wined3d_device_context_emit_set_sampler_state(&device->cs->c, sampler_idx, state, value); }
-void CDECL wined3d_device_set_scissor_rects(struct wined3d_device *device, unsigned int rect_count, - const RECT *rects) -{ - unsigned int i; - - TRACE("device %p, rect_count %u, rects %p.\n", device, rect_count, rects); - - for (i = 0; i < rect_count; ++i) - { - TRACE("%u: %s\n", i, wine_dbgstr_rect(&rects[i])); - } - - wined3d_device_context_set_scissor_rects(&device->cs->c, rect_count, rects); -} - void CDECL wined3d_device_context_get_scissor_rects(const struct wined3d_device_context *context, unsigned int *rect_count, RECT *rects) { @@ -1876,14 +1787,6 @@ struct wined3d_device_context * CDECL wined3d_device_get_immediate_context(struc return &device->cs->c; }
-void CDECL wined3d_device_set_vertex_declaration(struct wined3d_device *device, - struct wined3d_vertex_declaration *declaration) -{ - TRACE("device %p, declaration %p.\n", device, declaration); - - wined3d_device_context_set_vertex_declaration(&device->cs->c, declaration); -} - struct wined3d_vertex_declaration * CDECL wined3d_device_context_get_vertex_declaration( const struct wined3d_device_context *context) { @@ -2440,28 +2343,6 @@ void CDECL wined3d_device_context_draw_indexed(struct wined3d_device_context *co base_vertex_index, start_index, index_count, start_instance, instance_count, true); }
-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); - - return device->cs->c.state->shader[WINED3D_SHADER_TYPE_VERTEX]; -} - -void CDECL wined3d_device_set_constant_buffer(struct wined3d_device *device, - enum wined3d_shader_type type, UINT idx, struct wined3d_buffer *buffer) -{ - TRACE("device %p, type %#x, idx %u, buffer %p.\n", device, type, idx, buffer); - - return wined3d_device_context_set_constant_buffer(&device->cs->c, type, idx, buffer); -} - 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) { @@ -2476,14 +2357,6 @@ struct wined3d_buffer * CDECL wined3d_device_context_get_constant_buffer(const s return context->state->cb[shader_type][idx]; }
-void CDECL wined3d_device_set_vs_resource_view(struct wined3d_device *device, - UINT idx, struct wined3d_shader_resource_view *view) -{ - TRACE("device %p, idx %u, view %p.\n", device, idx, view); - - wined3d_device_context_set_shader_resource_view(&device->cs->c, WINED3D_SHADER_TYPE_VERTEX, idx, view); -} - struct wined3d_shader_resource_view * CDECL wined3d_device_context_get_shader_resource_view( const struct wined3d_device_context *context, enum wined3d_shader_type shader_type, unsigned int idx) { @@ -2496,33 +2369,6 @@ struct wined3d_shader_resource_view * CDECL wined3d_device_context_get_shader_re return context->state->shader_resource_view[shader_type][idx]; }
-static struct wined3d_shader_resource_view *wined3d_device_get_shader_resource_view( - const struct wined3d_device *device, enum wined3d_shader_type shader_type, unsigned int idx) -{ - if (idx >= MAX_SHADER_RESOURCE_VIEWS) - { - WARN("Invalid view index %u.\n", idx); - return NULL; - } - - return device->cs->c.state->shader_resource_view[shader_type][idx]; -} - -struct wined3d_shader_resource_view * CDECL wined3d_device_get_vs_resource_view(const struct wined3d_device *device, - UINT idx) -{ - TRACE("device %p, idx %u.\n", device, idx); - - return wined3d_device_get_shader_resource_view(device, WINED3D_SHADER_TYPE_VERTEX, idx); -} - -void CDECL wined3d_device_set_vs_sampler(struct wined3d_device *device, UINT idx, struct wined3d_sampler *sampler) -{ - TRACE("device %p, idx %u, sampler %p.\n", device, idx, sampler); - - wined3d_device_context_set_sampler(&device->cs->c, WINED3D_SHADER_TYPE_VERTEX, idx, sampler); -} - struct wined3d_sampler * CDECL wined3d_device_context_get_sampler(const struct wined3d_device_context *context, enum wined3d_shader_type shader_type, unsigned int idx) { @@ -2537,25 +2383,6 @@ struct wined3d_sampler * CDECL wined3d_device_context_get_sampler(const struct w return context->state->sampler[shader_type][idx]; }
-static struct wined3d_sampler *wined3d_device_get_sampler(const struct wined3d_device *device, - enum wined3d_shader_type shader_type, unsigned int idx) -{ - if (idx >= MAX_SAMPLER_OBJECTS) - { - WARN("Invalid sampler index %u.\n", idx); - return NULL; - } - - return device->cs->c.state->sampler[shader_type][idx]; -} - -struct wined3d_sampler * CDECL wined3d_device_get_vs_sampler(const struct wined3d_device *device, UINT idx) -{ - TRACE("device %p, idx %u.\n", device, idx); - - return wined3d_device_get_sampler(device, WINED3D_SHADER_TYPE_VERTEX, idx); -} - static void wined3d_device_set_vs_consts_b(struct wined3d_device *device, unsigned int start_idx, unsigned int count, const BOOL *constants) { @@ -2610,50 +2437,6 @@ static void wined3d_device_set_vs_consts_f(struct wined3d_device *device, wined3d_device_context_push_constants(&device->cs->c, WINED3D_PUSH_CONSTANTS_VS_F, start_idx, count, constants); }
-void CDECL wined3d_device_set_pixel_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_PIXEL, shader); -} - -struct wined3d_shader * CDECL wined3d_device_get_pixel_shader(const struct wined3d_device *device) -{ - TRACE("device %p.\n", device); - - return device->cs->c.state->shader[WINED3D_SHADER_TYPE_PIXEL]; -} - -void CDECL wined3d_device_set_ps_resource_view(struct wined3d_device *device, - UINT idx, struct wined3d_shader_resource_view *view) -{ - TRACE("device %p, idx %u, view %p.\n", device, idx, view); - - wined3d_device_context_set_shader_resource_view(&device->cs->c, WINED3D_SHADER_TYPE_PIXEL, idx, view); -} - -struct wined3d_shader_resource_view * CDECL wined3d_device_get_ps_resource_view(const struct wined3d_device *device, - UINT idx) -{ - TRACE("device %p, idx %u.\n", device, idx); - - return wined3d_device_get_shader_resource_view(device, WINED3D_SHADER_TYPE_PIXEL, idx); -} - -void CDECL wined3d_device_set_ps_sampler(struct wined3d_device *device, UINT idx, struct wined3d_sampler *sampler) -{ - TRACE("device %p, idx %u, sampler %p.\n", device, idx, sampler); - - wined3d_device_context_set_sampler(&device->cs->c, WINED3D_SHADER_TYPE_PIXEL, idx, sampler); -} - -struct wined3d_sampler * CDECL wined3d_device_get_ps_sampler(const struct wined3d_device *device, UINT idx) -{ - TRACE("device %p, idx %u.\n", device, idx); - - return wined3d_device_get_sampler(device, WINED3D_SHADER_TYPE_PIXEL, idx); -} - static void wined3d_device_set_ps_consts_b(struct wined3d_device *device, unsigned int start_idx, unsigned int count, const BOOL *constants) { @@ -2708,185 +2491,6 @@ static void wined3d_device_set_ps_consts_f(struct wined3d_device *device, wined3d_device_context_push_constants(&device->cs->c, WINED3D_PUSH_CONSTANTS_PS_F, start_idx, count, constants); }
-void CDECL wined3d_device_set_hull_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_HULL, shader); -} - -struct wined3d_shader * CDECL wined3d_device_get_hull_shader(const struct wined3d_device *device) -{ - TRACE("device %p.\n", device); - - return device->cs->c.state->shader[WINED3D_SHADER_TYPE_HULL]; -} - -void CDECL wined3d_device_set_hs_resource_view(struct wined3d_device *device, - unsigned int idx, struct wined3d_shader_resource_view *view) -{ - TRACE("device %p, idx %u, view %p.\n", device, idx, view); - - wined3d_device_context_set_shader_resource_view(&device->cs->c, WINED3D_SHADER_TYPE_HULL, idx, view); -} - -struct wined3d_shader_resource_view * CDECL wined3d_device_get_hs_resource_view(const struct wined3d_device *device, - unsigned int idx) -{ - TRACE("device %p, idx %u.\n", device, idx); - - return wined3d_device_get_shader_resource_view(device, WINED3D_SHADER_TYPE_HULL, idx); -} - -void CDECL wined3d_device_set_hs_sampler(struct wined3d_device *device, - unsigned int idx, struct wined3d_sampler *sampler) -{ - TRACE("device %p, idx %u, sampler %p.\n", device, idx, sampler); - - wined3d_device_context_set_sampler(&device->cs->c, WINED3D_SHADER_TYPE_HULL, idx, sampler); -} - -struct wined3d_sampler * CDECL wined3d_device_get_hs_sampler(const struct wined3d_device *device, unsigned int idx) -{ - TRACE("device %p, idx %u.\n", device, idx); - - return wined3d_device_get_sampler(device, WINED3D_SHADER_TYPE_HULL, idx); -} - -void CDECL wined3d_device_set_domain_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_DOMAIN, shader); -} - -struct wined3d_shader * CDECL wined3d_device_get_domain_shader(const struct wined3d_device *device) -{ - TRACE("device %p.\n", device); - - return device->cs->c.state->shader[WINED3D_SHADER_TYPE_DOMAIN]; -} - -void CDECL wined3d_device_set_ds_resource_view(struct wined3d_device *device, - unsigned int idx, struct wined3d_shader_resource_view *view) -{ - TRACE("device %p, idx %u, view %p.\n", device, idx, view); - - wined3d_device_context_set_shader_resource_view(&device->cs->c, WINED3D_SHADER_TYPE_DOMAIN, idx, view); -} - -struct wined3d_shader_resource_view * CDECL wined3d_device_get_ds_resource_view(const struct wined3d_device *device, - unsigned int idx) -{ - TRACE("device %p, idx %u.\n", device, idx); - - return wined3d_device_get_shader_resource_view(device, WINED3D_SHADER_TYPE_DOMAIN, idx); -} - -void CDECL wined3d_device_set_ds_sampler(struct wined3d_device *device, - unsigned int idx, struct wined3d_sampler *sampler) -{ - TRACE("device %p, idx %u, sampler %p.\n", device, idx, sampler); - - wined3d_device_context_set_sampler(&device->cs->c, WINED3D_SHADER_TYPE_DOMAIN, idx, sampler); -} - -struct wined3d_sampler * CDECL wined3d_device_get_ds_sampler(const struct wined3d_device *device, unsigned int idx) -{ - TRACE("device %p, idx %u.\n", device, idx); - - return wined3d_device_get_sampler(device, WINED3D_SHADER_TYPE_DOMAIN, idx); -} - -void CDECL wined3d_device_set_geometry_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_GEOMETRY, shader); -} - -struct wined3d_shader * CDECL wined3d_device_get_geometry_shader(const struct wined3d_device *device) -{ - TRACE("device %p.\n", device); - - return device->cs->c.state->shader[WINED3D_SHADER_TYPE_GEOMETRY]; -} - -void CDECL wined3d_device_set_gs_resource_view(struct wined3d_device *device, - UINT idx, struct wined3d_shader_resource_view *view) -{ - TRACE("device %p, idx %u, view %p.\n", device, idx, view); - - wined3d_device_context_set_shader_resource_view(&device->cs->c, WINED3D_SHADER_TYPE_GEOMETRY, idx, view); -} - -struct wined3d_shader_resource_view * CDECL wined3d_device_get_gs_resource_view(const struct wined3d_device *device, - UINT idx) -{ - TRACE("device %p, idx %u.\n", device, idx); - - return wined3d_device_get_shader_resource_view(device, WINED3D_SHADER_TYPE_GEOMETRY, idx); -} - -void CDECL wined3d_device_set_gs_sampler(struct wined3d_device *device, UINT idx, struct wined3d_sampler *sampler) -{ - TRACE("device %p, idx %u, sampler %p.\n", device, idx, sampler); - - wined3d_device_context_set_sampler(&device->cs->c, WINED3D_SHADER_TYPE_GEOMETRY, idx, sampler); -} - -struct wined3d_sampler * CDECL wined3d_device_get_gs_sampler(const struct wined3d_device *device, UINT idx) -{ - TRACE("device %p, idx %u.\n", device, idx); - - return wined3d_device_get_sampler(device, WINED3D_SHADER_TYPE_GEOMETRY, idx); -} - -void CDECL wined3d_device_set_compute_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_COMPUTE, shader); -} - -struct wined3d_shader * CDECL wined3d_device_get_compute_shader(const struct wined3d_device *device) -{ - TRACE("device %p.\n", device); - - return device->cs->c.state->shader[WINED3D_SHADER_TYPE_COMPUTE]; -} - -void CDECL wined3d_device_set_cs_resource_view(struct wined3d_device *device, - unsigned int idx, struct wined3d_shader_resource_view *view) -{ - TRACE("device %p, idx %u, view %p.\n", device, idx, view); - - wined3d_device_context_set_shader_resource_view(&device->cs->c, WINED3D_SHADER_TYPE_COMPUTE, idx, view); -} - -struct wined3d_shader_resource_view * CDECL wined3d_device_get_cs_resource_view(const struct wined3d_device *device, - unsigned int idx) -{ - TRACE("device %p, idx %u.\n", device, idx); - - return wined3d_device_get_shader_resource_view(device, WINED3D_SHADER_TYPE_COMPUTE, idx); -} - -void CDECL wined3d_device_set_cs_sampler(struct wined3d_device *device, - unsigned int idx, struct wined3d_sampler *sampler) -{ - TRACE("device %p, idx %u, sampler %p.\n", device, idx, sampler); - - wined3d_device_context_set_sampler(&device->cs->c, WINED3D_SHADER_TYPE_COMPUTE, idx, sampler); -} - -struct wined3d_sampler * CDECL wined3d_device_get_cs_sampler(const struct wined3d_device *device, unsigned int idx) -{ - TRACE("device %p, idx %u.\n", device, idx); - - return wined3d_device_get_sampler(device, WINED3D_SHADER_TYPE_COMPUTE, idx); -} - struct wined3d_unordered_access_view * CDECL wined3d_device_context_get_unordered_access_view( const struct wined3d_device_context *context, enum wined3d_pipeline pipeline, unsigned int idx) { @@ -2901,50 +2505,6 @@ struct wined3d_unordered_access_view * CDECL wined3d_device_context_get_unordere return context->state->unordered_access_view[pipeline][idx]; }
-static struct wined3d_unordered_access_view *wined3d_device_get_pipeline_unordered_access_view( - const struct wined3d_device *device, enum wined3d_pipeline pipeline, unsigned int idx) -{ - if (idx >= MAX_UNORDERED_ACCESS_VIEWS) - { - WARN("Invalid UAV index %u.\n", idx); - return NULL; - } - - return device->cs->c.state->unordered_access_view[pipeline][idx]; -} - -void CDECL wined3d_device_set_cs_uav(struct wined3d_device *device, unsigned int idx, - struct wined3d_unordered_access_view *uav, unsigned int initial_count) -{ - TRACE("device %p, idx %u, uav %p, initial_count %#x.\n", device, idx, uav, initial_count); - - wined3d_device_context_set_unordered_access_view(&device->cs->c, WINED3D_PIPELINE_COMPUTE, idx, uav, initial_count); -} - -struct wined3d_unordered_access_view * CDECL wined3d_device_get_cs_uav(const struct wined3d_device *device, - unsigned int idx) -{ - TRACE("device %p, idx %u.\n", device, idx); - - return wined3d_device_get_pipeline_unordered_access_view(device, WINED3D_PIPELINE_COMPUTE, idx); -} - -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) -{ - TRACE("device %p, idx %u, uav %p, initial_count %#x.\n", device, idx, uav, initial_count); - - wined3d_device_context_set_unordered_access_view(&device->cs->c, WINED3D_PIPELINE_GRAPHICS, idx, uav, initial_count); -} - -struct wined3d_unordered_access_view * CDECL wined3d_device_get_unordered_access_view( - const struct wined3d_device *device, unsigned int idx) -{ - TRACE("device %p, idx %u.\n", device, idx); - - return wined3d_device_get_pipeline_unordered_access_view(device, WINED3D_PIPELINE_GRAPHICS, idx); -} - void CDECL wined3d_device_set_max_frame_latency(struct wined3d_device *device, unsigned int latency) { unsigned int i; @@ -4462,14 +4022,6 @@ HRESULT CDECL wined3d_device_clear(struct wined3d_device *device, DWORD rect_cou return WINED3D_OK; }
-void CDECL wined3d_device_set_predication(struct wined3d_device *device, - struct wined3d_query *predicate, BOOL value) -{ - TRACE("device %p, predicate %p, value %#x.\n", device, predicate, value); - - wined3d_device_context_set_predication(&device->cs->c, predicate, value); -} - struct wined3d_query * CDECL wined3d_device_context_get_predication(struct wined3d_device_context *context, BOOL *value) { struct wined3d_state *state = context->state; @@ -4481,23 +4033,6 @@ struct wined3d_query * CDECL wined3d_device_context_get_predication(struct wined return state->predicate; }
-void CDECL wined3d_device_dispatch_compute(struct wined3d_device *device, - unsigned int group_count_x, unsigned int group_count_y, unsigned int group_count_z) -{ - TRACE("device %p, group_count_x %u, group_count_y %u, group_count_z %u.\n", - device, group_count_x, group_count_y, group_count_z); - - wined3d_device_context_dispatch(&device->cs->c, group_count_x, group_count_y, group_count_z); -} - -void CDECL wined3d_device_dispatch_compute_indirect(struct wined3d_device *device, - struct wined3d_buffer *buffer, unsigned int offset) -{ - TRACE("device %p, buffer %p, offset %u.\n", device, buffer, offset); - - wined3d_device_context_dispatch_indirect(&device->cs->c, buffer, offset); -} - void CDECL wined3d_device_context_set_primitive_type(struct wined3d_device_context *context, enum wined3d_primitive_type primitive_type, unsigned int patch_vertex_count) { @@ -4525,61 +4060,6 @@ void CDECL wined3d_device_context_get_primitive_type(const struct wined3d_device TRACE("Returning %s.\n", debug_d3dprimitivetype(*primitive_type)); }
-HRESULT CDECL wined3d_device_draw_primitive(struct wined3d_device *device, UINT start_vertex, UINT vertex_count) -{ - TRACE("device %p, start_vertex %u, vertex_count %u.\n", device, start_vertex, vertex_count); - - wined3d_device_context_draw(&device->cs->c, start_vertex, vertex_count, 0, 0); - - return WINED3D_OK; -} - -void CDECL wined3d_device_draw_primitive_instanced(struct wined3d_device *device, - UINT start_vertex, UINT vertex_count, UINT start_instance, UINT instance_count) -{ - TRACE("device %p, start_vertex %u, vertex_count %u, start_instance %u, instance_count %u.\n", - device, start_vertex, vertex_count, start_instance, instance_count); - - wined3d_device_context_draw(&device->cs->c, start_vertex, vertex_count, start_instance, instance_count); -} - -void CDECL wined3d_device_draw_primitive_instanced_indirect(struct wined3d_device *device, - struct wined3d_buffer *buffer, unsigned int offset) -{ - TRACE("device %p, buffer %p, offset %u.\n", device, buffer, offset); - - wined3d_device_context_draw_indirect(&device->cs->c, buffer, offset, false); -} - -void CDECL wined3d_device_draw_indexed_primitive(struct wined3d_device *device, UINT start_idx, UINT index_count) -{ - struct wined3d_state *state = device->cs->c.state; - - TRACE("device %p, start_idx %u, index_count %u.\n", device, start_idx, index_count); - - wined3d_device_context_draw_indexed(&device->cs->c, state->base_vertex_index, start_idx, index_count, 0, 0); -} - -void CDECL wined3d_device_draw_indexed_primitive_instanced(struct wined3d_device *device, - UINT start_idx, UINT index_count, UINT start_instance, UINT instance_count) -{ - struct wined3d_state *state = device->cs->c.state; - - TRACE("device %p, start_idx %u, index_count %u, start_instance %u, instance_count %u.\n", - device, start_idx, index_count, start_instance, instance_count); - - wined3d_device_context_draw_indexed(&device->cs->c, state->base_vertex_index, - start_idx, index_count, start_instance, instance_count); -} - -void CDECL wined3d_device_draw_indexed_primitive_instanced_indirect(struct wined3d_device *device, - struct wined3d_buffer *buffer, unsigned int offset) -{ - TRACE("device %p, buffer %p, offset %u.\n", device, buffer, offset); - - wined3d_device_context_draw_indirect(&device->cs->c, buffer, offset, true); -} - HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, struct wined3d_texture *src_texture, struct wined3d_texture *dst_texture) { @@ -5415,23 +4895,6 @@ struct wined3d_rendertarget_view * CDECL wined3d_device_context_get_depth_stenci return context->state->fb.depth_stencil; }
-HRESULT CDECL wined3d_device_set_rendertarget_view(struct wined3d_device *device, - unsigned int view_idx, struct wined3d_rendertarget_view *view, BOOL set_viewport) -{ - TRACE("device %p, view_idx %u, view %p, set_viewport %#x.\n", - device, view_idx, view, set_viewport); - - return wined3d_device_context_set_rendertarget_view(&device->cs->c, view_idx, view, set_viewport); -} - -HRESULT CDECL wined3d_device_set_depth_stencil_view(struct wined3d_device *device, - struct wined3d_rendertarget_view *view) -{ - TRACE("device %p, view %p.\n", device, view); - - return wined3d_device_context_set_depth_stencil_view(&device->cs->c, view); -} - void CDECL wined3d_device_context_generate_mipmaps(struct wined3d_device_context *context, struct wined3d_shader_resource_view *view) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index f339d91ee5c..ece69929c65 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -44,99 +44,36 @@ @ cdecl wined3d_device_clear(ptr long ptr long ptr float long) @ cdecl wined3d_device_create(ptr ptr long ptr long long ptr long ptr ptr) @ cdecl wined3d_device_decref(ptr) -@ cdecl wined3d_device_dispatch_compute(ptr long long long) -@ cdecl wined3d_device_dispatch_compute_indirect(ptr ptr long) -@ cdecl wined3d_device_draw_indexed_primitive(ptr long long) -@ cdecl wined3d_device_draw_indexed_primitive_instanced(ptr long long long long) -@ cdecl wined3d_device_draw_indexed_primitive_instanced_indirect(ptr ptr long) -@ cdecl wined3d_device_draw_primitive(ptr long long) -@ cdecl wined3d_device_draw_primitive_instanced(ptr long long long long) -@ cdecl wined3d_device_draw_primitive_instanced_indirect(ptr ptr long) @ 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_clip_status(ptr ptr) -@ cdecl wined3d_device_get_compute_shader(ptr) @ cdecl wined3d_device_get_creation_parameters(ptr ptr) -@ cdecl wined3d_device_get_cs_resource_view(ptr long) -@ cdecl wined3d_device_get_cs_sampler(ptr long) -@ cdecl wined3d_device_get_cs_uav(ptr long) @ cdecl wined3d_device_get_device_caps(ptr ptr) @ cdecl wined3d_device_get_display_mode(ptr long ptr ptr) -@ cdecl wined3d_device_get_domain_shader(ptr) -@ cdecl wined3d_device_get_ds_resource_view(ptr long) -@ cdecl wined3d_device_get_ds_sampler(ptr long) @ cdecl wined3d_device_get_gamma_ramp(ptr long ptr) -@ cdecl wined3d_device_get_geometry_shader(ptr) -@ cdecl wined3d_device_get_gs_resource_view(ptr long) -@ cdecl wined3d_device_get_gs_sampler(ptr long) -@ cdecl wined3d_device_get_hs_resource_view(ptr long) -@ cdecl wined3d_device_get_hs_sampler(ptr long) -@ cdecl wined3d_device_get_hull_shader(ptr) @ cdecl wined3d_device_get_immediate_context(ptr) @ cdecl wined3d_device_get_max_frame_latency(ptr) @ cdecl wined3d_device_get_npatch_mode(ptr) -@ cdecl wined3d_device_get_pixel_shader(ptr) -@ cdecl wined3d_device_get_ps_resource_view(ptr long) -@ cdecl wined3d_device_get_ps_sampler(ptr long) @ cdecl wined3d_device_get_raster_status(ptr long ptr) -@ cdecl wined3d_device_get_render_state(ptr long) @ cdecl wined3d_device_get_software_vertex_processing(ptr) @ cdecl wined3d_device_get_state(ptr) @ cdecl wined3d_device_get_swapchain(ptr long) @ cdecl wined3d_device_get_swapchain_count(ptr) -@ cdecl wined3d_device_get_unordered_access_view(ptr long) -@ cdecl wined3d_device_get_vertex_shader(ptr) -@ cdecl wined3d_device_get_vs_resource_view(ptr long) -@ cdecl wined3d_device_get_vs_sampler(ptr long) @ cdecl wined3d_device_get_wined3d(ptr) @ cdecl wined3d_device_incref(ptr) @ cdecl wined3d_device_process_vertices(ptr long long long ptr ptr long long) @ cdecl wined3d_device_release_focus_window(ptr) @ cdecl wined3d_device_reset(ptr ptr ptr ptr long) -@ cdecl wined3d_device_set_base_vertex_index(ptr long) -@ cdecl wined3d_device_set_blend_state(ptr ptr ptr long) @ 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) -@ cdecl wined3d_device_set_cs_resource_view(ptr long ptr) -@ cdecl wined3d_device_set_cs_sampler(ptr long ptr) -@ cdecl wined3d_device_set_cs_uav(ptr long ptr long) @ cdecl wined3d_device_set_cursor_position(ptr long long long) @ cdecl wined3d_device_set_cursor_properties(ptr long long ptr long) -@ cdecl wined3d_device_set_depth_stencil_state(ptr ptr long) -@ cdecl wined3d_device_set_depth_stencil_view(ptr ptr) @ cdecl wined3d_device_set_dialog_box_mode(ptr long) -@ cdecl wined3d_device_set_domain_shader(ptr ptr) -@ cdecl wined3d_device_set_ds_resource_view(ptr long ptr) -@ cdecl wined3d_device_set_ds_sampler(ptr long ptr) @ cdecl wined3d_device_set_gamma_ramp(ptr long long ptr) -@ cdecl wined3d_device_set_geometry_shader(ptr ptr) -@ cdecl wined3d_device_set_gs_resource_view(ptr long ptr) -@ cdecl wined3d_device_set_gs_sampler(ptr long ptr) -@ cdecl wined3d_device_set_hs_resource_view(ptr long ptr) -@ 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_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_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_rendertarget_view(ptr long ptr 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_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_resource_view(ptr long ptr) -@ cdecl wined3d_device_set_vs_sampler(ptr long ptr) @ cdecl wined3d_device_show_cursor(ptr long) @ cdecl wined3d_device_update_texture(ptr ptr ptr) @ cdecl wined3d_device_validate_device(ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index d4762b79e6f..db567784de6 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2357,72 +2357,28 @@ HRESULT __cdecl wined3d_device_create(struct wined3d *wined3d, struct wined3d_ad const enum wined3d_feature_level *feature_levels, unsigned int feature_level_count, struct wined3d_device_parent *device_parent, struct wined3d_device **device); ULONG __cdecl wined3d_device_decref(struct wined3d_device *device); -void __cdecl wined3d_device_dispatch_compute(struct wined3d_device *device, - unsigned int group_count_x, unsigned int group_count_y, unsigned int group_count_z); -void __cdecl wined3d_device_dispatch_compute_indirect(struct wined3d_device *device, - struct wined3d_buffer *buffer, unsigned int offset); -void __cdecl wined3d_device_draw_indexed_primitive(struct wined3d_device *device, UINT start_idx, UINT index_count); -void __cdecl wined3d_device_draw_indexed_primitive_instanced(struct wined3d_device *device, - UINT start_idx, UINT index_count, UINT start_instance, UINT instance_count); -void __cdecl wined3d_device_draw_indexed_primitive_instanced_indirect(struct wined3d_device *device, - struct wined3d_buffer *buffer, unsigned int offset); -HRESULT __cdecl wined3d_device_draw_primitive(struct wined3d_device *device, UINT start_vertex, UINT vertex_count); -void __cdecl wined3d_device_draw_primitive_instanced(struct wined3d_device *device, - UINT start_vertex, UINT vertex_count, UINT start_instance, UINT instance_count); -void __cdecl wined3d_device_draw_primitive_instanced_indirect(struct wined3d_device *device, - struct wined3d_buffer *buffer, unsigned int offset); HRESULT __cdecl wined3d_device_end_scene(struct wined3d_device *device); void __cdecl wined3d_device_evict_managed_resources(struct wined3d_device *device); -void __cdecl wined3d_device_flush(struct wined3d_device *device); UINT __cdecl wined3d_device_get_available_texture_mem(const struct wined3d_device *device); HRESULT __cdecl wined3d_device_get_clip_status(const struct wined3d_device *device, struct wined3d_clip_status *clip_status); -struct wined3d_shader * __cdecl wined3d_device_get_compute_shader(const struct wined3d_device *device); void __cdecl wined3d_device_get_creation_parameters(const struct wined3d_device *device, struct wined3d_device_creation_parameters *creation_parameters); -struct wined3d_shader_resource_view * __cdecl wined3d_device_get_cs_resource_view(const struct wined3d_device *device, - unsigned int idx); -struct wined3d_sampler * __cdecl wined3d_device_get_cs_sampler(const struct wined3d_device *device, unsigned int idx); -struct wined3d_unordered_access_view * __cdecl wined3d_device_get_cs_uav(const struct wined3d_device *device, - unsigned int idx); HRESULT __cdecl wined3d_device_get_device_caps(const struct wined3d_device *device, struct wined3d_caps *caps); HRESULT __cdecl wined3d_device_get_display_mode(const struct wined3d_device *device, UINT swapchain_idx, struct wined3d_display_mode *mode, enum wined3d_display_rotation *rotation); -struct wined3d_shader * __cdecl wined3d_device_get_domain_shader(const struct wined3d_device *device); -struct wined3d_shader_resource_view * __cdecl wined3d_device_get_ds_resource_view(const struct wined3d_device *device, - unsigned int idx); -struct wined3d_sampler * __cdecl wined3d_device_get_ds_sampler(const struct wined3d_device *device, unsigned int idx); void __cdecl wined3d_device_get_gamma_ramp(const struct wined3d_device *device, UINT swapchain_idx, struct wined3d_gamma_ramp *ramp); -struct wined3d_shader * __cdecl wined3d_device_get_geometry_shader(const struct wined3d_device *device); -struct wined3d_shader_resource_view * __cdecl wined3d_device_get_gs_resource_view(const struct wined3d_device *device, - UINT idx); -struct wined3d_sampler * __cdecl wined3d_device_get_gs_sampler(const struct wined3d_device *device, UINT idx); -struct wined3d_shader_resource_view * __cdecl wined3d_device_get_hs_resource_view(const struct wined3d_device *device, - unsigned int idx); -struct wined3d_sampler * __cdecl wined3d_device_get_hs_sampler(const struct wined3d_device *device, unsigned int idx); -struct wined3d_shader * __cdecl wined3d_device_get_hull_shader(const struct wined3d_device *device); struct wined3d_device_context * __cdecl wined3d_device_get_immediate_context(struct wined3d_device *device); unsigned int __cdecl wined3d_device_get_max_frame_latency(const struct wined3d_device *device); float __cdecl wined3d_device_get_npatch_mode(const struct wined3d_device *device); -struct wined3d_shader * __cdecl wined3d_device_get_pixel_shader(const struct wined3d_device *device); -struct wined3d_shader_resource_view * __cdecl wined3d_device_get_ps_resource_view(const struct wined3d_device *device, - UINT idx); -struct wined3d_sampler * __cdecl wined3d_device_get_ps_sampler(const struct wined3d_device *device, UINT idx); HRESULT __cdecl wined3d_device_get_raster_status(const struct wined3d_device *device, UINT swapchain_idx, struct wined3d_raster_status *raster_status); -DWORD __cdecl wined3d_device_get_render_state(const struct wined3d_device *device, enum wined3d_render_state state); BOOL __cdecl wined3d_device_get_software_vertex_processing(const struct wined3d_device *device); struct wined3d_state * __cdecl wined3d_device_get_state(struct wined3d_device *device); 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); -struct wined3d_unordered_access_view * __cdecl wined3d_device_get_unordered_access_view( - const struct wined3d_device *device, unsigned int idx); -struct wined3d_shader * __cdecl wined3d_device_get_vertex_shader(const struct wined3d_device *device); -struct wined3d_shader_resource_view * __cdecl wined3d_device_get_vs_resource_view(const struct wined3d_device *device, - UINT idx); -struct wined3d_sampler * __cdecl wined3d_device_get_vs_sampler(const struct wined3d_device *device, UINT idx); struct wined3d * __cdecl wined3d_device_get_wined3d(const struct wined3d_device *device); ULONG __cdecl wined3d_device_incref(struct wined3d_device *device); HRESULT __cdecl wined3d_device_process_vertices(struct wined3d_device *device, @@ -2432,77 +2388,19 @@ void __cdecl wined3d_device_release_focus_window(struct wined3d_device *device); HRESULT __cdecl wined3d_device_reset(struct wined3d_device *device, const struct wined3d_swapchain_desc *swapchain_desc, const struct wined3d_display_mode *mode, wined3d_device_reset_cb callback, BOOL reset_state); -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, unsigned int sample_mask); 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); -void __cdecl wined3d_device_set_constant_buffer(struct wined3d_device *device, enum wined3d_shader_type type, UINT idx, - struct wined3d_buffer *buffer); -void __cdecl wined3d_device_set_cs_resource_view(struct wined3d_device *device, - unsigned int idx, struct wined3d_shader_resource_view *view); -void __cdecl wined3d_device_set_cs_sampler(struct wined3d_device *device, - unsigned int idx, struct wined3d_sampler *sampler); -void __cdecl wined3d_device_set_cs_uav(struct wined3d_device *device, unsigned int idx, - struct wined3d_unordered_access_view *uav, unsigned int initial_count); void __cdecl wined3d_device_set_cursor_position(struct wined3d_device *device, int x_screen_space, int y_screen_space, DWORD flags); HRESULT __cdecl wined3d_device_set_cursor_properties(struct wined3d_device *device, UINT x_hotspot, UINT y_hotspot, struct wined3d_texture *texture, unsigned int sub_resource_idx); -void __cdecl wined3d_device_set_depth_stencil_state(struct wined3d_device *device, - struct wined3d_depth_stencil_state *state, unsigned int stencil_ref); -HRESULT __cdecl wined3d_device_set_depth_stencil_view(struct wined3d_device *device, - struct wined3d_rendertarget_view *view); HRESULT __cdecl wined3d_device_set_dialog_box_mode(struct wined3d_device *device, BOOL enable_dialogs); -void __cdecl wined3d_device_set_domain_shader(struct wined3d_device *device, struct wined3d_shader *shader); -void __cdecl wined3d_device_set_ds_resource_view(struct wined3d_device *device, - unsigned int idx, struct wined3d_shader_resource_view *view); -void __cdecl wined3d_device_set_ds_sampler(struct wined3d_device *device, - unsigned int idx, struct wined3d_sampler *sampler); void __cdecl wined3d_device_set_gamma_ramp(const struct wined3d_device *device, UINT swapchain_idx, DWORD flags, const struct wined3d_gamma_ramp *ramp); -void __cdecl wined3d_device_set_geometry_shader(struct wined3d_device *device, struct wined3d_shader *shader); -void __cdecl wined3d_device_set_gs_resource_view(struct wined3d_device *device, - UINT idx, struct wined3d_shader_resource_view *view); -void __cdecl wined3d_device_set_gs_sampler(struct wined3d_device *device, UINT idx, struct wined3d_sampler *sampler); -void __cdecl wined3d_device_set_hs_resource_view(struct wined3d_device *device, - unsigned int idx, struct wined3d_shader_resource_view *view); -void __cdecl wined3d_device_set_hs_sampler(struct wined3d_device *device, - unsigned int idx, struct wined3d_sampler *sampler); -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); 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); -void __cdecl wined3d_device_set_pixel_shader(struct wined3d_device *device, struct wined3d_shader *shader); -void __cdecl wined3d_device_set_predication(struct wined3d_device *device, - struct wined3d_query *predicate, BOOL value); -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); -void __cdecl wined3d_device_set_rasterizer_state(struct wined3d_device *device, - struct wined3d_rasterizer_state *rasterizer_state); -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_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); -void __cdecl wined3d_device_set_stream_output(struct wined3d_device *device, UINT idx, - 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); -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, - struct wined3d_vertex_declaration *declaration); -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); -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); BOOL __cdecl wined3d_device_show_cursor(struct wined3d_device *device, BOOL show); HRESULT __cdecl wined3d_device_update_texture(struct wined3d_device *device, struct wined3d_texture *src_texture, struct wined3d_texture *dst_texture);
Signed-off-by: Henri Verbeet hverbeet@codeweavers.com
-
Henri Verbeet -
Zebediah Figura