Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
822bcfdf
Commit
822bcfdf
authored
Apr 10, 2013
by
Stefan Dösinger
Committed by
Alexandre Julliard
Apr 10, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Remove the unused idx_data parameter from draw_primitive.
parent
f6d2737e
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
5 deletions
+6
-5
device.c
dlls/wined3d/device.c
+3
-3
drawprim.c
dlls/wined3d/drawprim.c
+2
-1
wined3d_private.h
dlls/wined3d/wined3d_private.h
+1
-1
No files found.
dlls/wined3d/device.c
View file @
822bcfdf
...
...
@@ -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
* 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
;
}
...
...
@@ -4060,7 +4060,7 @@ HRESULT CDECL wined3d_device_draw_indexed_primitive(struct wined3d_device *devic
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
;
}
...
...
@@ -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
);
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. */
...
...
dlls/wined3d/drawprim.c
View file @
822bcfdf
...
...
@@ -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 */
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_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
;
struct
wined3d_context
*
context
;
BOOL
emulation
=
FALSE
;
const
void
*
idx_data
=
NULL
;
UINT
idx_size
=
0
;
unsigned
int
i
;
...
...
dlls/wined3d/wined3d_private.h
View file @
822bcfdf
...
...
@@ -925,7 +925,7 @@ struct wined3d_stream_info
};
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
;
typedef
void
(
WINE_GLAPI
*
glAttribFunc
)(
const
void
*
data
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment