Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
4c723a76
Commit
4c723a76
authored
Oct 31, 2006
by
Ivan Gyurdiev
Committed by
Alexandre Julliard
Oct 31, 2006
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Add D3DSTREAMSOURCE codes to the WINED3D namespace.
parent
f71edf22
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
10 deletions
+14
-10
device.c
dlls/wined3d/device.c
+9
-9
wined3d_private.h
dlls/wined3d/wined3d_private.h
+1
-1
wined3d_types.h
include/wine/wined3d_types.h
+4
-0
No files found.
dlls/wined3d/device.c
View file @
4c723a76
...
...
@@ -2368,17 +2368,17 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetStreamSource(IWineD3DDevice *iface,
/* D3d9 only, but shouldn't hurt d3d8 */
UINT
streamFlags
;
streamFlags
=
StreamNumber
&
(
D3DSTREAMSOURCE_INDEXEDDATA
|
D3DSTREAMSOURCE_INSTANCEDATA
);
streamFlags
=
StreamNumber
&
(
WINED3DSTREAMSOURCE_INDEXEDDATA
|
WINE
D3DSTREAMSOURCE_INSTANCEDATA
);
if
(
streamFlags
)
{
if
(
streamFlags
&
D3DSTREAMSOURCE_INDEXEDDATA
)
{
if
(
streamFlags
&
WINE
D3DSTREAMSOURCE_INDEXEDDATA
)
{
FIXME
(
"stream index data not supported
\n
"
);
}
if
(
streamFlags
&
D3DSTREAMSOURCE_INDEXEDDATA
)
{
if
(
streamFlags
&
WINE
D3DSTREAMSOURCE_INDEXEDDATA
)
{
FIXME
(
"stream instance data not supported
\n
"
);
}
}
StreamNumber
&=
~
(
D3DSTREAMSOURCE_INDEXEDDATA
|
D3DSTREAMSOURCE_INSTANCEDATA
);
StreamNumber
&=
~
(
WINED3DSTREAMSOURCE_INDEXEDDATA
|
WINE
D3DSTREAMSOURCE_INSTANCEDATA
);
if
(
StreamNumber
>=
MAX_STREAMS
)
{
WARN
(
"Stream out of range %d
\n
"
,
StreamNumber
);
...
...
@@ -2434,17 +2434,17 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetStreamSource(IWineD3DDevice *iface,
This
->
stateBlock
->
streamSource
[
StreamNumber
],
This
->
stateBlock
->
streamStride
[
StreamNumber
]);
streamFlags
=
StreamNumber
&
(
D3DSTREAMSOURCE_INDEXEDDATA
|
D3DSTREAMSOURCE_INSTANCEDATA
);
streamFlags
=
StreamNumber
&
(
WINED3DSTREAMSOURCE_INDEXEDDATA
|
WINE
D3DSTREAMSOURCE_INSTANCEDATA
);
if
(
streamFlags
)
{
if
(
streamFlags
&
D3DSTREAMSOURCE_INDEXEDDATA
)
{
if
(
streamFlags
&
WINE
D3DSTREAMSOURCE_INDEXEDDATA
)
{
FIXME
(
"stream index data not supported
\n
"
);
}
if
(
streamFlags
&
D3DSTREAMSOURCE_INDEXEDDATA
)
{
if
(
streamFlags
&
WINE
D3DSTREAMSOURCE_INDEXEDDATA
)
{
FIXME
(
"stream instance data not supported
\n
"
);
}
}
StreamNumber
&=
~
(
D3DSTREAMSOURCE_INDEXEDDATA
|
D3DSTREAMSOURCE_INSTANCEDATA
);
StreamNumber
&=
~
(
WINED3DSTREAMSOURCE_INDEXEDDATA
|
WINE
D3DSTREAMSOURCE_INSTANCEDATA
);
if
(
StreamNumber
>=
MAX_STREAMS
)
{
WARN
(
"Stream out of range %d
\n
"
,
StreamNumber
);
...
...
@@ -2479,7 +2479,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetStreamSourceFreq(IWineD3DDevice *ifa
IWineD3DDeviceImpl
*
This
=
(
IWineD3DDeviceImpl
*
)
iface
;
TRACE
(
"(%p) StreamNumber(%d), Divider(%d)
\n
"
,
This
,
StreamNumber
,
Divider
);
This
->
updateStateBlock
->
streamFlags
[
StreamNumber
]
=
Divider
&
(
D3DSTREAMSOURCE_INSTANCEDATA
|
D3DSTREAMSOURCE_INDEXEDDATA
);
This
->
updateStateBlock
->
streamFlags
[
StreamNumber
]
=
Divider
&
(
WINED3DSTREAMSOURCE_INSTANCEDATA
|
WINE
D3DSTREAMSOURCE_INDEXEDDATA
);
This
->
updateStateBlock
->
changed
.
streamFreq
[
StreamNumber
]
=
TRUE
;
This
->
updateStateBlock
->
set
.
streamFreq
[
StreamNumber
]
=
TRUE
;
...
...
dlls/wined3d/wined3d_private.h
View file @
4c723a76
...
...
@@ -1102,7 +1102,7 @@ struct IWineD3DStateBlockImpl
UINT
streamOffset
[
MAX_STREAMS
];
IWineD3DVertexBuffer
*
streamSource
[
MAX_STREAMS
];
UINT
streamFreq
[
MAX_STREAMS
];
UINT
streamFlags
[
MAX_STREAMS
];
/*0 |
D3DSTREAMSOURCE_INSTANCEDATA |
D3DSTREAMSOURCE_INDEXEDDATA */
UINT
streamFlags
[
MAX_STREAMS
];
/*0 |
WINED3DSTREAMSOURCE_INSTANCEDATA | WINE
D3DSTREAMSOURCE_INDEXEDDATA */
/* Indices */
IWineD3DIndexBuffer
*
pIndexData
;
...
...
include/wine/wined3d_types.h
View file @
4c723a76
...
...
@@ -1533,4 +1533,8 @@ typedef enum _WINED3DSURFTYPE {
#define WINED3DCLEAR_ZBUFFER 0x00000002
#define WINED3DCLEAR_STENCIL 0x00000004
/* Stream source flags */
#define WINED3DSTREAMSOURCE_INDEXEDDATA (1 << 30)
#define WINED3DSTREAMSOURCE_INSTANCEDATA (2 << 30)
#endif
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