Skip to content

W
wine-winehq
Commit e29a0cf4 authored by Józef Kucia's avatar Józef Kucia Committed by Alexandre Julliard
Browse files
Options

d3d11: Rename d3d10_device to d3d_device.

parent b2f5fad4
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 41 deletions
dlls/d3d11/async.c
View file @ e29a0cf4
......@@ -189,7 +189,7 @@ struct d3d10_query *unsafe_impl_from_ID3D10Query(ID3D10Query *iface)
return CONTAINING_RECORD(iface, struct d3d10_query, ID3D10Query_iface);
}
HRESULT d3d10_query_init(struct d3d10_query *query, struct d3d10_device *device,
HRESULT d3d10_query_init(struct d3d10_query *query, struct d3d_device *device,
const D3D10_QUERY_DESC *desc, BOOL predicate)
{
HRESULT hr;
......
dlls/d3d11/buffer.c
View file @ e29a0cf4
......@@ -234,7 +234,7 @@ static const struct wined3d_parent_ops d3d10_buffer_wined3d_parent_ops =
d3d10_buffer_wined3d_object_released,
};
HRESULT d3d10_buffer_init(struct d3d10_buffer *buffer, struct d3d10_device *device,
HRESULT d3d10_buffer_init(struct d3d10_buffer *buffer, struct d3d_device *device,
const D3D10_BUFFER_DESC *desc, const D3D10_SUBRESOURCE_DATA *data)
{
struct wined3d_buffer_desc wined3d_desc;
......
dlls/d3d11/d3d11_main.c
View file @ e29a0cf4
......@@ -68,13 +68,13 @@ static UINT WINAPI layer_get_size(enum dxgi_device_layer_id id, struct layer_get
return 0;
}
return sizeof(struct d3d10_device);
return sizeof(struct d3d_device);
}
static HRESULT WINAPI layer_create(enum dxgi_device_layer_id id, void **layer_base, DWORD unknown0,
void *device_object, REFIID riid, void **device_layer)
{
struct d3d10_device *object;
struct d3d_device *object;
HRESULT hr;
TRACE("id %#x, layer_base %p, unknown0 %#x, device_object %p, riid %s, device_layer %p\n",
......
dlls/d3d11/d3d11_private.h
View file @ e29a0cf4
......@@ -46,7 +46,7 @@
#define TAG_OSGN MAKE_TAG('O', 'S', 'G', 'N')
#define TAG_SHDR MAKE_TAG('S', 'H', 'D', 'R')
struct d3d10_device;
struct d3d_device;
struct d3d10_shader_info
{
......@@ -98,7 +98,7 @@ struct d3d10_texture2d
ID3D10Device1 *device;
};
HRESULT d3d10_texture2d_init(struct d3d10_texture2d *texture, struct d3d10_device *device,
HRESULT d3d10_texture2d_init(struct d3d10_texture2d *texture, struct d3d_device *device,
const D3D10_TEXTURE2D_DESC *desc, const D3D10_SUBRESOURCE_DATA *initial_data) DECLSPEC_HIDDEN;
struct d3d10_texture2d *unsafe_impl_from_ID3D10Texture2D(ID3D10Texture2D *iface) DECLSPEC_HIDDEN;
......@@ -114,7 +114,7 @@ struct d3d10_texture3d
ID3D10Device1 *device;
};
HRESULT d3d10_texture3d_init(struct d3d10_texture3d *texture, struct d3d10_device *device,
HRESULT d3d10_texture3d_init(struct d3d10_texture3d *texture, struct d3d_device *device,
const D3D10_TEXTURE3D_DESC *desc, const D3D10_SUBRESOURCE_DATA *data) DECLSPEC_HIDDEN;
/* ID3D10Buffer */
......@@ -128,7 +128,7 @@ struct d3d10_buffer
ID3D10Device1 *device;
};
HRESULT d3d10_buffer_init(struct d3d10_buffer *buffer, struct d3d10_device *device,
HRESULT d3d10_buffer_init(struct d3d10_buffer *buffer, struct d3d_device *device,
const D3D10_BUFFER_DESC *desc, const D3D10_SUBRESOURCE_DATA *data) DECLSPEC_HIDDEN;
struct d3d10_buffer *unsafe_impl_from_ID3D10Buffer(ID3D10Buffer *iface) DECLSPEC_HIDDEN;
......@@ -145,7 +145,7 @@ struct d3d10_depthstencil_view
ID3D10Device1 *device;
};
HRESULT d3d10_depthstencil_view_init(struct d3d10_depthstencil_view *view, struct d3d10_device *device,
HRESULT d3d10_depthstencil_view_init(struct d3d10_depthstencil_view *view, struct d3d_device *device,
ID3D10Resource *resource, const D3D10_DEPTH_STENCIL_VIEW_DESC *desc) DECLSPEC_HIDDEN;
struct d3d10_depthstencil_view *unsafe_impl_from_ID3D10DepthStencilView(ID3D10DepthStencilView *iface) DECLSPEC_HIDDEN;
......@@ -162,7 +162,7 @@ struct d3d10_rendertarget_view
ID3D10Device1 *device;
};
HRESULT d3d10_rendertarget_view_init(struct d3d10_rendertarget_view *view, struct d3d10_device *device,
HRESULT d3d10_rendertarget_view_init(struct d3d10_rendertarget_view *view, struct d3d_device *device,
ID3D10Resource *resource, const D3D10_RENDER_TARGET_VIEW_DESC *desc) DECLSPEC_HIDDEN;
struct d3d10_rendertarget_view *unsafe_impl_from_ID3D10RenderTargetView(ID3D10RenderTargetView *iface) DECLSPEC_HIDDEN;
......@@ -179,7 +179,7 @@ struct d3d10_shader_resource_view
ID3D10Device1 *device;
};
HRESULT d3d10_shader_resource_view_init(struct d3d10_shader_resource_view *view, struct d3d10_device *device,
HRESULT d3d10_shader_resource_view_init(struct d3d10_shader_resource_view *view, struct d3d_device *device,
ID3D10Resource *resource, const D3D10_SHADER_RESOURCE_VIEW_DESC *desc) DECLSPEC_HIDDEN;
struct d3d10_shader_resource_view *unsafe_impl_from_ID3D10ShaderResourceView(
ID3D10ShaderResourceView *iface) DECLSPEC_HIDDEN;
......@@ -194,7 +194,7 @@ struct d3d10_input_layout
struct wined3d_vertex_declaration *wined3d_decl;
};
HRESULT d3d10_input_layout_init(struct d3d10_input_layout *layout, struct d3d10_device *device,
HRESULT d3d10_input_layout_init(struct d3d10_input_layout *layout, struct d3d_device *device,
const D3D10_INPUT_ELEMENT_DESC *element_descs, UINT element_count,
const void *shader_byte_code, SIZE_T shader_byte_code_length) DECLSPEC_HIDDEN;
struct d3d10_input_layout *unsafe_impl_from_ID3D10InputLayout(ID3D10InputLayout *iface) DECLSPEC_HIDDEN;
......@@ -210,7 +210,7 @@ struct d3d10_vertex_shader
ID3D10Device1 *device;
};
HRESULT d3d10_vertex_shader_init(struct d3d10_vertex_shader *shader, struct d3d10_device *device,
HRESULT d3d10_vertex_shader_init(struct d3d10_vertex_shader *shader, struct d3d_device *device,
const void *byte_code, SIZE_T byte_code_length) DECLSPEC_HIDDEN;
struct d3d10_vertex_shader *unsafe_impl_from_ID3D10VertexShader(ID3D10VertexShader *iface) DECLSPEC_HIDDEN;
......@@ -224,7 +224,7 @@ struct d3d10_geometry_shader
struct wined3d_shader *wined3d_shader;
};
HRESULT d3d10_geometry_shader_init(struct d3d10_geometry_shader *shader, struct d3d10_device *device,
HRESULT d3d10_geometry_shader_init(struct d3d10_geometry_shader *shader, struct d3d_device *device,
const void *byte_code, SIZE_T byte_code_length) DECLSPEC_HIDDEN;
struct d3d10_geometry_shader *unsafe_impl_from_ID3D10GeometryShader(ID3D10GeometryShader *iface) DECLSPEC_HIDDEN;
......@@ -239,7 +239,7 @@ struct d3d10_pixel_shader
ID3D10Device1 *device;
};
HRESULT d3d10_pixel_shader_init(struct d3d10_pixel_shader *shader, struct d3d10_device *device,
HRESULT d3d10_pixel_shader_init(struct d3d10_pixel_shader *shader, struct d3d_device *device,
const void *byte_code, SIZE_T byte_code_length) DECLSPEC_HIDDEN;
struct d3d10_pixel_shader *unsafe_impl_from_ID3D10PixelShader(ID3D10PixelShader *iface) DECLSPEC_HIDDEN;
......@@ -258,7 +258,7 @@ struct d3d10_blend_state
ID3D10Device1 *device;
};
HRESULT d3d10_blend_state_init(struct d3d10_blend_state *state, struct d3d10_device *device,
HRESULT d3d10_blend_state_init(struct d3d10_blend_state *state, struct d3d_device *device,
const D3D10_BLEND_DESC *desc) DECLSPEC_HIDDEN;
struct d3d10_blend_state *unsafe_impl_from_ID3D10BlendState(ID3D10BlendState *iface) DECLSPEC_HIDDEN;
......@@ -274,7 +274,7 @@ struct d3d10_depthstencil_state
ID3D10Device1 *device;
};
HRESULT d3d10_depthstencil_state_init(struct d3d10_depthstencil_state *state, struct d3d10_device *device,
HRESULT d3d10_depthstencil_state_init(struct d3d10_depthstencil_state *state, struct d3d_device *device,
const D3D10_DEPTH_STENCIL_DESC *desc) DECLSPEC_HIDDEN;
struct d3d10_depthstencil_state *unsafe_impl_from_ID3D10DepthStencilState(
ID3D10DepthStencilState *iface) DECLSPEC_HIDDEN;
......@@ -291,7 +291,7 @@ struct d3d10_rasterizer_state
ID3D10Device1 *device;
};
HRESULT d3d10_rasterizer_state_init(struct d3d10_rasterizer_state *state, struct d3d10_device *device,
HRESULT d3d10_rasterizer_state_init(struct d3d10_rasterizer_state *state, struct d3d_device *device,
const D3D10_RASTERIZER_DESC *desc) DECLSPEC_HIDDEN;
struct d3d10_rasterizer_state *unsafe_impl_from_ID3D10RasterizerState(ID3D10RasterizerState *iface) DECLSPEC_HIDDEN;
......@@ -308,7 +308,7 @@ struct d3d10_sampler_state
ID3D10Device1 *device;
};
HRESULT d3d10_sampler_state_init(struct d3d10_sampler_state *state, struct d3d10_device *device,
HRESULT d3d10_sampler_state_init(struct d3d10_sampler_state *state, struct d3d_device *device,
const D3D10_SAMPLER_DESC *desc) DECLSPEC_HIDDEN;
struct d3d10_sampler_state *unsafe_impl_from_ID3D10SamplerState(ID3D10SamplerState *iface) DECLSPEC_HIDDEN;
......@@ -324,12 +324,12 @@ struct d3d10_query
ID3D10Device1 *device;
};
HRESULT d3d10_query_init(struct d3d10_query *query, struct d3d10_device *device,
HRESULT d3d10_query_init(struct d3d10_query *query, struct d3d_device *device,
const D3D10_QUERY_DESC *desc, BOOL predicate) DECLSPEC_HIDDEN;
struct d3d10_query *unsafe_impl_from_ID3D10Query(ID3D10Query *iface) DECLSPEC_HIDDEN;
/* IDirect3D10Device1 */
struct d3d10_device
struct d3d_device
{
IUnknown IUnknown_inner;
ID3D11Device ID3D11Device_iface;
......@@ -354,12 +354,12 @@ struct d3d10_device
struct d3d10_rasterizer_state *rasterizer_state;
};
static inline struct d3d10_device *impl_from_ID3D10Device(ID3D10Device1 *iface)
static inline struct d3d_device *impl_from_ID3D10Device(ID3D10Device1 *iface)
{
return CONTAINING_RECORD(iface, struct d3d10_device, ID3D10Device1_iface);
return CONTAINING_RECORD(iface, struct d3d_device, ID3D10Device1_iface);
}
HRESULT d3d10_device_init(struct d3d10_device *device, void *outer_unknown) DECLSPEC_HIDDEN;
HRESULT d3d10_device_init(struct d3d_device *device, void *outer_unknown) DECLSPEC_HIDDEN;
/* Layered device */
enum dxgi_device_layer_id
......
dlls/d3d11/inputlayout.c
View file @ e29a0cf4
......@@ -220,7 +220,7 @@ static const struct wined3d_parent_ops d3d10_input_layout_wined3d_parent_ops =
d3d10_input_layout_wined3d_object_destroyed,
};
HRESULT d3d10_input_layout_init(struct d3d10_input_layout *layout, struct d3d10_device *device,
HRESULT d3d10_input_layout_init(struct d3d10_input_layout *layout, struct d3d_device *device,
const D3D10_INPUT_ELEMENT_DESC *element_descs, UINT element_count,
const void *shader_byte_code, SIZE_T shader_byte_code_length)
{
......
dlls/d3d11/shader.c
View file @ e29a0cf4
......@@ -259,7 +259,7 @@ static const struct wined3d_parent_ops d3d10_vertex_shader_wined3d_parent_ops =
d3d10_vertex_shader_wined3d_object_destroyed,
};
HRESULT d3d10_vertex_shader_init(struct d3d10_vertex_shader *shader, struct d3d10_device *device,
HRESULT d3d10_vertex_shader_init(struct d3d10_vertex_shader *shader, struct d3d_device *device,
const void *byte_code, SIZE_T byte_code_length)
{
struct wined3d_shader_signature output_signature;
......@@ -435,7 +435,7 @@ static const struct wined3d_parent_ops d3d10_geometry_shader_wined3d_parent_ops
d3d10_geometry_shader_wined3d_object_destroyed,
};
HRESULT d3d10_geometry_shader_init(struct d3d10_geometry_shader *shader, struct d3d10_device *device,
HRESULT d3d10_geometry_shader_init(struct d3d10_geometry_shader *shader, struct d3d_device *device,
const void *byte_code, SIZE_T byte_code_length)
{
struct wined3d_shader_signature output_signature;
......@@ -626,7 +626,7 @@ static const struct wined3d_parent_ops d3d10_pixel_shader_wined3d_parent_ops =
d3d10_pixel_shader_wined3d_object_destroyed,
};
HRESULT d3d10_pixel_shader_init(struct d3d10_pixel_shader *shader, struct d3d10_device *device,
HRESULT d3d10_pixel_shader_init(struct d3d10_pixel_shader *shader, struct d3d_device *device,
const void *byte_code, SIZE_T byte_code_length)
{
struct wined3d_shader_signature output_signature;
......
dlls/d3d11/state.c
View file @ e29a0cf4
......@@ -76,7 +76,7 @@ static ULONG STDMETHODCALLTYPE d3d10_blend_state_Release(ID3D10BlendState *iface
if (!refcount)
{
struct d3d10_device *device = impl_from_ID3D10Device(state->device);
struct d3d_device *device = impl_from_ID3D10Device(state->device);
wined3d_mutex_lock();
wine_rb_remove(&device->blend_states, &state->desc);
ID3D10Device1_Release(state->device);
......@@ -159,7 +159,7 @@ static const struct ID3D10BlendStateVtbl d3d10_blend_state_vtbl =
d3d10_blend_state_GetDesc,
};
HRESULT d3d10_blend_state_init(struct d3d10_blend_state *state, struct d3d10_device *device,
HRESULT d3d10_blend_state_init(struct d3d10_blend_state *state, struct d3d_device *device,
const D3D10_BLEND_DESC *desc)
{
state->ID3D10BlendState_iface.lpVtbl = &d3d10_blend_state_vtbl;
......@@ -238,7 +238,7 @@ static ULONG STDMETHODCALLTYPE d3d10_depthstencil_state_Release(ID3D10DepthStenc
if (!refcount)
{
struct d3d10_device *device = impl_from_ID3D10Device(state->device);
struct d3d_device *device = impl_from_ID3D10Device(state->device);
wined3d_mutex_lock();
wine_rb_remove(&device->depthstencil_states, &state->desc);
ID3D10Device1_Release(state->device);
......@@ -321,7 +321,7 @@ static const struct ID3D10DepthStencilStateVtbl d3d10_depthstencil_state_vtbl =
d3d10_depthstencil_state_GetDesc,
};
HRESULT d3d10_depthstencil_state_init(struct d3d10_depthstencil_state *state, struct d3d10_device *device,
HRESULT d3d10_depthstencil_state_init(struct d3d10_depthstencil_state *state, struct d3d_device *device,
const D3D10_DEPTH_STENCIL_DESC *desc)
{
state->ID3D10DepthStencilState_iface.lpVtbl = &d3d10_depthstencil_state_vtbl;
......@@ -400,7 +400,7 @@ static ULONG STDMETHODCALLTYPE d3d10_rasterizer_state_Release(ID3D10RasterizerSt
if (!refcount)
{
struct d3d10_device *device = impl_from_ID3D10Device(state->device);
struct d3d_device *device = impl_from_ID3D10Device(state->device);
wined3d_mutex_lock();
wine_rb_remove(&device->rasterizer_states, &state->desc);
ID3D10Device1_Release(state->device);
......@@ -483,7 +483,7 @@ static const struct ID3D10RasterizerStateVtbl d3d10_rasterizer_state_vtbl =
d3d10_rasterizer_state_GetDesc,
};
HRESULT d3d10_rasterizer_state_init(struct d3d10_rasterizer_state *state, struct d3d10_device *device,
HRESULT d3d10_rasterizer_state_init(struct d3d10_rasterizer_state *state, struct d3d_device *device,
const D3D10_RASTERIZER_DESC *desc)
{
state->ID3D10RasterizerState_iface.lpVtbl = &d3d10_rasterizer_state_vtbl;
......@@ -562,7 +562,7 @@ static ULONG STDMETHODCALLTYPE d3d10_sampler_state_Release(ID3D10SamplerState *i
if (!refcount)
{
struct d3d10_device *device = impl_from_ID3D10Device(state->device);
struct d3d_device *device = impl_from_ID3D10Device(state->device);
wined3d_mutex_lock();
wined3d_sampler_decref(state->wined3d_sampler);
......@@ -683,7 +683,7 @@ static enum wined3d_cmp_func wined3d_cmp_func_from_d3d10core(D3D10_COMPARISON_FU
return (enum wined3d_cmp_func)f;
}
HRESULT d3d10_sampler_state_init(struct d3d10_sampler_state *state, struct d3d10_device *device,
HRESULT d3d10_sampler_state_init(struct d3d10_sampler_state *state, struct d3d_device *device,
const D3D10_SAMPLER_DESC *desc)
{
struct wined3d_sampler_desc wined3d_desc;
......
dlls/d3d11/texture.c
View file @ e29a0cf4
......@@ -310,7 +310,7 @@ static const struct wined3d_parent_ops d3d10_texture2d_wined3d_parent_ops =
d3d10_texture2d_wined3d_object_released,
};
HRESULT d3d10_texture2d_init(struct d3d10_texture2d *texture, struct d3d10_device *device,
HRESULT d3d10_texture2d_init(struct d3d10_texture2d *texture, struct d3d_device *device,
const D3D10_TEXTURE2D_DESC *desc, const D3D10_SUBRESOURCE_DATA *data)
{
struct wined3d_resource_desc wined3d_desc;
......@@ -602,7 +602,7 @@ static const struct wined3d_parent_ops d3d10_texture3d_wined3d_parent_ops =
d3d10_texture3d_wined3d_object_released,
};
HRESULT d3d10_texture3d_init(struct d3d10_texture3d *texture, struct d3d10_device *device,
HRESULT d3d10_texture3d_init(struct d3d10_texture3d *texture, struct d3d_device *device,
const D3D10_TEXTURE3D_DESC *desc, const D3D10_SUBRESOURCE_DATA *data)
{
struct wined3d_resource_desc wined3d_desc;
......
dlls/d3d11/view.c
View file @ e29a0cf4
......@@ -554,7 +554,7 @@ static void wined3d_depth_stencil_view_desc_from_d3d10core(struct wined3d_render
}
}
HRESULT d3d10_depthstencil_view_init(struct d3d10_depthstencil_view *view, struct d3d10_device *device,
HRESULT d3d10_depthstencil_view_init(struct d3d10_depthstencil_view *view, struct d3d_device *device,
ID3D10Resource *resource, const D3D10_DEPTH_STENCIL_VIEW_DESC *desc)
{
struct wined3d_rendertarget_view_desc wined3d_desc;
......@@ -818,7 +818,7 @@ static void wined3d_rendertarget_view_desc_from_d3d10core(struct wined3d_rendert
}
}
HRESULT d3d10_rendertarget_view_init(struct d3d10_rendertarget_view *view, struct d3d10_device *device,
HRESULT d3d10_rendertarget_view_init(struct d3d10_rendertarget_view *view, struct d3d_device *device,
ID3D10Resource *resource, const D3D10_RENDER_TARGET_VIEW_DESC *desc)
{
struct wined3d_rendertarget_view_desc wined3d_desc;
......@@ -1020,7 +1020,7 @@ static const struct ID3D10ShaderResourceViewVtbl d3d10_shader_resource_view_vtbl
d3d10_shader_resource_view_GetDesc,
};
HRESULT d3d10_shader_resource_view_init(struct d3d10_shader_resource_view *view, struct d3d10_device *device,
HRESULT d3d10_shader_resource_view_init(struct d3d10_shader_resource_view *view, struct d3d_device *device,
ID3D10Resource *resource, const D3D10_SHADER_RESOURCE_VIEW_DESC *desc)
{
struct wined3d_resource *wined3d_resource;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment