system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-11-05 18:01:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

wined3d: Remove the unused idx_data parameter from draw_primitive.

Browse source
This commit is contained in:
Stefan Dösinger 2013-04-10 13:39:46 +02:00 committed by Alexandre Julliard
parent f6d2737e62
commit 822bcfdf74
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
dlls/wined3d/device.c
View file

@ -4027,7 +4027,7 @@ HRESULT CDECL wined3d_device_draw_primitive(struct wined3d_device *device, UINT
/* Account for the loading offset due to index buffers. Instead of /* Account for the loading offset due to index buffers. Instead of
* reloading all sources correct it with the startvertex parameter. */ * reloading all sources correct it with the startvertex parameter. */
draw_primitive(device, start_vertex, vertex_count, 0, 0, FALSE, NULL); draw_primitive(device, start_vertex, vertex_count, 0, 0, FALSE);
return WINED3D_OK; return WINED3D_OK;
} }
@ -4060,7 +4060,7 @@ HRESULT CDECL wined3d_device_draw_indexed_primitive(struct wined3d_device *devic
device_invalidate_state(device, STATE_BASEVERTEXINDEX); device_invalidate_state(device, STATE_BASEVERTEXINDEX);
} }
draw_primitive(device, start_idx, index_count, 0, 0, TRUE, NULL); draw_primitive(device, start_idx, index_count, 0, 0, TRUE);
return WINED3D_OK; return WINED3D_OK;
} }
@ -4070,7 +4070,7 @@ void CDECL wined3d_device_draw_indexed_primitive_instanced(struct wined3d_device
{ {
TRACE("device %p, start_idx %u, index_count %u.\n", device, start_idx, index_count); TRACE("device %p, start_idx %u, index_count %u.\n", device, start_idx, index_count);
draw_primitive(device, start_idx, index_count, start_instance, instance_count, TRUE, NULL); draw_primitive(device, start_idx, index_count, start_instance, instance_count, TRUE);
} }
/* This is a helper function for UpdateTexture, there is no UpdateVolume method in D3D. */ /* This is a helper function for UpdateTexture, there is no UpdateVolume method in D3D. */

3
dlls/wined3d/drawprim.c
View file

@ -577,7 +577,7 @@ static void remove_vbos(const struct wined3d_gl_info *gl_info,
/* Routine common to the draw primitive and draw indexed primitive routines */ /* Routine common to the draw primitive and draw indexed primitive routines */
void draw_primitive(struct wined3d_device *device, UINT start_idx, UINT index_count, void draw_primitive(struct wined3d_device *device, UINT start_idx, UINT index_count,
UINT start_instance, UINT instance_count, BOOL indexed, const void *idx_data) UINT start_instance, UINT instance_count, BOOL indexed)
{ {
const struct wined3d_state *state = &device->stateBlock->state; const struct wined3d_state *state = &device->stateBlock->state;
const struct wined3d_stream_info *stream_info; const struct wined3d_stream_info *stream_info;
@ -586,6 +586,7 @@ void draw_primitive(struct wined3d_device *device, UINT start_idx, UINT index_co
const struct wined3d_gl_info *gl_info; const struct wined3d_gl_info *gl_info;
struct wined3d_context *context; struct wined3d_context *context;
BOOL emulation = FALSE; BOOL emulation = FALSE;
const void *idx_data = NULL;
UINT idx_size = 0; UINT idx_size = 0;
unsigned int i; unsigned int i;

2
dlls/wined3d/wined3d_private.h
View file

@ -925,7 +925,7 @@ struct wined3d_stream_info
}; };
void draw_primitive(struct wined3d_device *device, UINT start_idx, UINT index_count, void draw_primitive(struct wined3d_device *device, UINT start_idx, UINT index_count,
UINT start_instance, UINT instance_count, BOOL indexed, const void *idx_data) DECLSPEC_HIDDEN; UINT start_instance, UINT instance_count, BOOL indexed) DECLSPEC_HIDDEN;
DWORD get_flexible_vertex_size(DWORD d3dvtVertexType) DECLSPEC_HIDDEN; DWORD get_flexible_vertex_size(DWORD d3dvtVertexType) DECLSPEC_HIDDEN;
typedef void (WINE_GLAPI *glAttribFunc)(const void *data); typedef void (WINE_GLAPI *glAttribFunc)(const void *data);