Skip to content

W
wine-winehq
Commit bea8d0a7 authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard
Browse files
Options

wined3d: Get rid of the IWineD3DBuffer typedef.

parent a27ee75e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 8 deletions
dlls/wined3d/buffer.c
View file @ bea8d0a7
...@@ -1167,8 +1167,6 @@ WINED3DRESOURCETYPE CDECL wined3d_buffer_get_type(const struct wined3d_buffer *b ...@@ -1167,8 +1167,6 @@ WINED3DRESOURCETYPE CDECL wined3d_buffer_get_type(const struct wined3d_buffer *b
return resource_get_type(&buffer->resource); return resource_get_type(&buffer->resource);
} }
/* IWineD3DBuffer methods */
static DWORD buffer_sanitize_flags(struct wined3d_buffer *buffer, DWORD flags) static DWORD buffer_sanitize_flags(struct wined3d_buffer *buffer, DWORD flags)
{ {
/* Not all flags make sense together, but Windows never returns an error. Catch the /* Not all flags make sense together, but Windows never returns an error. Catch the
......
dlls/wined3d/stateblock.c
View file @ bea8d0a7
...@@ -984,8 +984,7 @@ HRESULT CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblo ...@@ -984,8 +984,7 @@ HRESULT CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblo
if (stateblock->changed.indices) if (stateblock->changed.indices)
{ {
IWineD3DDevice_SetIndexBuffer(device, (IWineD3DBuffer *)stateblock->state.index_buffer, IWineD3DDevice_SetIndexBuffer(device, stateblock->state.index_buffer, stateblock->state.index_format);
stateblock->state.index_format);
IWineD3DDevice_SetBaseVertexIndex(device, stateblock->state.base_vertex_index); IWineD3DDevice_SetBaseVertexIndex(device, stateblock->state.base_vertex_index);
} }
...@@ -1014,7 +1013,7 @@ HRESULT CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblo ...@@ -1014,7 +1013,7 @@ HRESULT CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblo
{ {
if (map & 1) if (map & 1)
IWineD3DDevice_SetStreamSource(device, i, IWineD3DDevice_SetStreamSource(device, i,
(IWineD3DBuffer *)stateblock->state.streams[i].buffer, stateblock->state.streams[i].buffer,
0, stateblock->state.streams[i].stride); 0, stateblock->state.streams[i].stride);
} }
......
dlls/wined3d/wined3d_private.h
View file @ bea8d0a7
...@@ -55,7 +55,6 @@ ...@@ -55,7 +55,6 @@
typedef struct IWineD3DSurfaceImpl IWineD3DSurfaceImpl; typedef struct IWineD3DSurfaceImpl IWineD3DSurfaceImpl;
typedef struct IWineD3DDeviceImpl IWineD3DDeviceImpl; typedef struct IWineD3DDeviceImpl IWineD3DDeviceImpl;
typedef struct IWineD3DSwapChainImpl IWineD3DSwapChainImpl; typedef struct IWineD3DSwapChainImpl IWineD3DSwapChainImpl;
typedef struct wined3d_buffer IWineD3DBuffer;
struct IWineD3DBaseShaderImpl; struct IWineD3DBaseShaderImpl;
struct IWineD3DBaseTextureImpl; struct IWineD3DBaseTextureImpl;
...@@ -2514,8 +2513,6 @@ struct wined3d_query ...@@ -2514,8 +2513,6 @@ struct wined3d_query
HRESULT query_init(struct wined3d_query *query, IWineD3DDeviceImpl *device, WINED3DQUERYTYPE type) DECLSPEC_HIDDEN; HRESULT query_init(struct wined3d_query *query, IWineD3DDeviceImpl *device, WINED3DQUERYTYPE type) DECLSPEC_HIDDEN;
/* IWineD3DBuffer */
/* TODO: Add tests and support for FLOAT16_4 POSITIONT, D3DCOLOR position, other /* TODO: Add tests and support for FLOAT16_4 POSITIONT, D3DCOLOR position, other
* fixed function semantics as D3DCOLOR or FLOAT16 */ * fixed function semantics as D3DCOLOR or FLOAT16 */
enum wined3d_buffer_conversion_type enum wined3d_buffer_conversion_type
......
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