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
498f9c50
Commit
498f9c50
authored
Feb 14, 2007
by
H. Verbeet
Committed by
Alexandre Julliard
Feb 15, 2007
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Use WINED3DSTREAMSOURCE_INSTANCEDATA rather than D3DSTREAMSOURCE_INSTANCEDATA.
parent
055d8d46
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
drawprim.c
dlls/wined3d/drawprim.c
+2
-2
state.c
dlls/wined3d/state.c
+1
-1
No files found.
dlls/wined3d/drawprim.c
View file @
498f9c50
...
...
@@ -1182,7 +1182,7 @@ inline void drawStridedInstanced(IWineD3DDevice *iface, WineDirect3DVertexStride
/* First, figure out how many instances we have to draw */
for
(
i
=
0
;
i
<
MAX_STREAMS
;
i
++
)
{
/* Look at all non-instanced streams */
if
(
!
(
stateblock
->
streamFlags
[
i
]
&
D3DSTREAMSOURCE_INSTANCEDATA
)
&&
if
(
!
(
stateblock
->
streamFlags
[
i
]
&
WINE
D3DSTREAMSOURCE_INSTANCEDATA
)
&&
stateblock
->
streamSource
[
i
])
{
int
inst
=
stateblock
->
streamFreq
[
i
];
...
...
@@ -1194,7 +1194,7 @@ inline void drawStridedInstanced(IWineD3DDevice *iface, WineDirect3DVertexStride
}
for
(
i
=
0
;
i
<
sizeof
(
sd
->
u
.
input
)
/
sizeof
(
sd
->
u
.
input
[
0
]);
i
++
)
{
if
(
stateblock
->
streamFlags
[
sd
->
u
.
input
[
i
].
streamNo
]
&
D3DSTREAMSOURCE_INSTANCEDATA
)
{
if
(
stateblock
->
streamFlags
[
sd
->
u
.
input
[
i
].
streamNo
]
&
WINE
D3DSTREAMSOURCE_INSTANCEDATA
)
{
instancedData
[
numInstancedAttribs
]
=
i
;
numInstancedAttribs
++
;
}
...
...
dlls/wined3d/state.c
View file @
498f9c50
...
...
@@ -2155,7 +2155,7 @@ static inline void loadNumberedArrays(IWineD3DStateBlockImpl *stateblock, WineDi
continue
;
/* Do not load instance data. It will be specified using glTexCoord by drawprim */
if
(
stateblock
->
streamFlags
[
strided
->
u
.
input
[
i
].
streamNo
]
&
D3DSTREAMSOURCE_INSTANCEDATA
)
{
if
(
stateblock
->
streamFlags
[
strided
->
u
.
input
[
i
].
streamNo
]
&
WINE
D3DSTREAMSOURCE_INSTANCEDATA
)
{
GL_EXTCALL
(
glDisableVertexAttribArrayARB
(
i
));
stateblock
->
wineD3DDevice
->
instancedDraw
=
TRUE
;
continue
;
...
...
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