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
60e32659
Commit
60e32659
authored
Sep 25, 2009
by
Henri Verbeet
Committed by
Alexandre Julliard
Sep 25, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Rename IWineD3DDevice::SetIndices() to IWineD3DDevice::SetIndexBuffer().
parent
f88c6e5c
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
17 additions
and
14 deletions
+17
-14
device.c
dlls/d3d10core/device.c
+1
-1
device.c
dlls/d3d8/device.c
+1
-1
device.c
dlls/d3d9/device.c
+2
-2
device.c
dlls/ddraw/device.c
+2
-2
surface.c
dlls/ddraw/surface.c
+1
-1
device.c
dlls/wined3d/device.c
+5
-3
stateblock.c
dlls/wined3d/stateblock.c
+4
-3
wined3d.idl
include/wine/wined3d.idl
+1
-1
No files found.
dlls/d3d10core/device.c
View file @
60e32659
...
...
@@ -215,7 +215,7 @@ static void STDMETHODCALLTYPE d3d10_device_IASetIndexBuffer(ID3D10Device *iface,
TRACE
(
"iface %p, buffer %p, format %s, offset %u.
\n
"
,
iface
,
buffer
,
debug_dxgi_format
(
format
),
offset
);
IWineD3DDevice_SetInd
ices
(
This
->
wined3d_device
,
buffer
?
((
struct
d3d10_buffer
*
)
buffer
)
->
wined3d_buffer
:
NULL
,
IWineD3DDevice_SetInd
exBuffer
(
This
->
wined3d_device
,
buffer
?
((
struct
d3d10_buffer
*
)
buffer
)
->
wined3d_buffer
:
NULL
,
wined3dformat_from_dxgi_format
(
format
));
if
(
offset
)
FIXME
(
"offset %u not supported.
\n
"
,
offset
);
}
...
...
dlls/d3d8/device.c
View file @
60e32659
...
...
@@ -2060,7 +2060,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_SetIndices(LPDIRECT3DDEVICE8 iface, I
*/
wined3d_mutex_lock
();
IWineD3DDevice_SetBaseVertexIndex
(
This
->
WineD3DDevice
,
baseVertexIndex
);
hr
=
IWineD3DDevice_SetInd
ices
(
This
->
WineD3DDevice
,
hr
=
IWineD3DDevice_SetInd
exBuffer
(
This
->
WineD3DDevice
,
ib
?
ib
->
wineD3DIndexBuffer
:
NULL
,
ib
?
ib
->
format
:
WINED3DFMT_UNKNOWN
);
wined3d_mutex_unlock
();
...
...
dlls/d3d9/device.c
View file @
60e32659
...
...
@@ -508,7 +508,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_Reset(LPDIRECT3DDEVICE9EX iface, D3
* below fails, the device is considered "lost", and _Reset and _Release are the only allowed calls
*/
wined3d_mutex_lock
();
IWineD3DDevice_SetInd
ices
(
This
->
WineD3DDevice
,
NULL
,
WINED3DFMT_UNKNOWN
);
IWineD3DDevice_SetInd
exBuffer
(
This
->
WineD3DDevice
,
NULL
,
WINED3DFMT_UNKNOWN
);
for
(
i
=
0
;
i
<
16
;
i
++
)
{
IWineD3DDevice_SetStreamSource
(
This
->
WineD3DDevice
,
i
,
NULL
,
0
,
0
);
}
...
...
@@ -1934,7 +1934,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_SetIndices(LPDIRECT3DDEVICE9EX ifac
TRACE
(
"(%p) Relay
\n
"
,
This
);
wined3d_mutex_lock
();
hr
=
IWineD3DDevice_SetInd
ices
(
This
->
WineD3DDevice
,
hr
=
IWineD3DDevice_SetInd
exBuffer
(
This
->
WineD3DDevice
,
ib
?
ib
->
wineD3DIndexBuffer
:
NULL
,
ib
?
ib
->
format
:
WINED3DFMT_UNKNOWN
);
wined3d_mutex_unlock
();
...
...
dlls/ddraw/device.c
View file @
60e32659
...
...
@@ -316,7 +316,7 @@ IDirect3DDeviceImpl_7_Release(IDirect3DDevice7 *iface)
EnterCriticalSection
(
&
ddraw_cs
);
/* Free the index buffer. */
IWineD3DDevice_SetInd
ices
(
This
->
wineD3DDevice
,
NULL
,
WINED3DFMT_UNKNOWN
);
IWineD3DDevice_SetInd
exBuffer
(
This
->
wineD3DDevice
,
NULL
,
WINED3DFMT_UNKNOWN
);
IWineD3DBuffer_GetParent
(
This
->
indexbuffer
,
(
IUnknown
**
)
&
IndexBufferParent
);
IParent_Release
(
IndexBufferParent
);
/* Once for the getParent */
...
...
@@ -4266,7 +4266,7 @@ IDirect3DDeviceImpl_7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface,
/* Set the index stream */
IWineD3DDevice_SetBaseVertexIndex
(
This
->
wineD3DDevice
,
StartVertex
);
hr
=
IWineD3DDevice_SetInd
ices
(
This
->
wineD3DDevice
,
This
->
indexbuffer
,
hr
=
IWineD3DDevice_SetInd
exBuffer
(
This
->
wineD3DDevice
,
This
->
indexbuffer
,
WINED3DFMT_R16_UINT
);
/* Set the vertex stream source */
...
...
dlls/ddraw/surface.c
View file @
60e32659
...
...
@@ -317,7 +317,7 @@ IDirectDrawSurfaceImpl_Release(IDirectDrawSurface7 *iface)
TRACE
(
"(%p) Destroying the render target, uninitializing D3D
\n
"
,
This
);
/* Unset any index buffer, just to be sure */
IWineD3DDevice_SetInd
ices
(
ddraw
->
wineD3DDevice
,
NULL
,
WINED3DFMT_UNKNOWN
);
IWineD3DDevice_SetInd
exBuffer
(
ddraw
->
wineD3DDevice
,
NULL
,
WINED3DFMT_UNKNOWN
);
IWineD3DDevice_SetDepthStencilSurface
(
ddraw
->
wineD3DDevice
,
NULL
);
IWineD3DDevice_SetVertexDeclaration
(
ddraw
->
wineD3DDevice
,
NULL
);
for
(
i
=
0
;
i
<
ddraw
->
numConvertedDecls
;
i
++
)
...
...
dlls/wined3d/device.c
View file @
60e32659
...
...
@@ -3064,8 +3064,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetMaterial(IWineD3DDevice *iface, WINE
/*****
* Get / Set Indices
*****/
static
HRESULT
WINAPI
IWineD3DDeviceImpl_SetIndices
(
IWineD3DDevice
*
iface
,
IWineD3DBuffer
*
pIndexData
,
WINED3DFORMAT
fmt
)
{
IWineD3DDeviceImpl
*
This
=
(
IWineD3DDeviceImpl
*
)
iface
;
static
HRESULT
WINAPI
IWineD3DDeviceImpl_SetIndexBuffer
(
IWineD3DDevice
*
iface
,
IWineD3DBuffer
*
pIndexData
,
WINED3DFORMAT
fmt
)
{
IWineD3DDeviceImpl
*
This
=
(
IWineD3DDeviceImpl
*
)
iface
;
IWineD3DBuffer
*
oldIdxs
;
TRACE
(
"(%p) : Setting to %p
\n
"
,
This
,
pIndexData
);
...
...
@@ -7393,7 +7395,7 @@ const IWineD3DDeviceVtbl IWineD3DDevice_Vtbl =
IWineD3DDeviceImpl_GetDepthStencilSurface
,
IWineD3DDeviceImpl_SetGammaRamp
,
IWineD3DDeviceImpl_GetGammaRamp
,
IWineD3DDeviceImpl_SetInd
ices
,
IWineD3DDeviceImpl_SetInd
exBuffer
,
IWineD3DDeviceImpl_GetIndices
,
IWineD3DDeviceImpl_SetBaseVertexIndex
,
IWineD3DDeviceImpl_GetBaseVertexIndex
,
...
...
dlls/wined3d/stateblock.c
View file @
60e32659
...
...
@@ -842,8 +842,9 @@ should really perform a delta so that only the changes get updated*/
This
->
wineD3DDevice
->
updateStateBlock
->
gl_primitive_type
=
This
->
gl_primitive_type
;
}
if
(
This
->
changed
.
indices
)
{
IWineD3DDevice_SetIndices
(
pDevice
,
This
->
pIndexData
,
This
->
IndexFmt
);
if
(
This
->
changed
.
indices
)
{
IWineD3DDevice_SetIndexBuffer
(
pDevice
,
This
->
pIndexData
,
This
->
IndexFmt
);
IWineD3DDevice_SetBaseVertexIndex
(
pDevice
,
This
->
baseVertexIndex
);
}
...
...
@@ -1025,7 +1026,7 @@ should really perform a delta so that only the changes get updated*/
IWineD3DDevice_SetTransform
(
pDevice
,
i
,
&
This
->
transforms
[
i
]);
}
This
->
wineD3DDevice
->
updateStateBlock
->
gl_primitive_type
=
This
->
gl_primitive_type
;
IWineD3DDevice_SetInd
ices
(
pDevice
,
This
->
pIndexData
,
This
->
IndexFmt
);
IWineD3DDevice_SetInd
exBuffer
(
pDevice
,
This
->
pIndexData
,
This
->
IndexFmt
);
IWineD3DDevice_SetBaseVertexIndex
(
pDevice
,
This
->
baseVertexIndex
);
IWineD3DDevice_SetVertexDeclaration
(
pDevice
,
This
->
vertexDecl
);
IWineD3DDevice_SetMaterial
(
pDevice
,
&
This
->
material
);
...
...
include/wine/wined3d.idl
View file @
60e32659
...
...
@@ -3118,7 +3118,7 @@ interface IWineD3DDevice : IWineD3DBase
[
in
]
UINT
swapchain_idx
,
[
out
]
WINED3DGAMMARAMP
*
ramp
)
;
HRESULT
SetInd
ices
(
HRESULT
SetInd
exBuffer
(
[
in
]
IWineD3DBuffer
*
index_buffer
,
[
in
]
WINED3DFORMAT
format
)
;
...
...
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