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
52c35814
Commit
52c35814
authored
Sep 17, 2022
by
Zebediah Figura
Committed by
Alexandre Julliard
Nov 09, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3d8: Build without -DWINE_NO_LONG_TYPES.
parent
11f00e84
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
68 additions
and
70 deletions
+68
-70
Makefile.in
dlls/d3d8/Makefile.in
+0
-1
buffer.c
dlls/d3d8/buffer.c
+12
-12
device.c
dlls/d3d8/device.c
+0
-0
directx.c
dlls/d3d8/directx.c
+8
-8
shader.c
dlls/d3d8/shader.c
+6
-6
surface.c
dlls/d3d8/surface.c
+5
-5
swapchain.c
dlls/d3d8/swapchain.c
+4
-4
texture.c
dlls/d3d8/texture.c
+17
-17
vertexdeclaration.c
dlls/d3d8/vertexdeclaration.c
+14
-14
volume.c
dlls/d3d8/volume.c
+2
-3
No files found.
dlls/d3d8/Makefile.in
View file @
52c35814
EXTRADEFS
=
-DWINE_NO_LONG_TYPES
MODULE
=
d3d8.dll
MODULE
=
d3d8.dll
IMPORTLIB
=
d3d8
IMPORTLIB
=
d3d8
IMPORTS
=
dxguid uuid wined3d
IMPORTS
=
dxguid uuid wined3d
...
...
dlls/d3d8/buffer.c
View file @
52c35814
...
@@ -49,7 +49,7 @@ static ULONG WINAPI d3d8_vertexbuffer_AddRef(IDirect3DVertexBuffer8 *iface)
...
@@ -49,7 +49,7 @@ static ULONG WINAPI d3d8_vertexbuffer_AddRef(IDirect3DVertexBuffer8 *iface)
struct
d3d8_vertexbuffer
*
buffer
=
impl_from_IDirect3DVertexBuffer8
(
iface
);
struct
d3d8_vertexbuffer
*
buffer
=
impl_from_IDirect3DVertexBuffer8
(
iface
);
ULONG
refcount
=
InterlockedIncrement
(
&
buffer
->
resource
.
refcount
);
ULONG
refcount
=
InterlockedIncrement
(
&
buffer
->
resource
.
refcount
);
TRACE
(
"%p increasing refcount to %u.
\n
"
,
iface
,
refcount
);
TRACE
(
"%p increasing refcount to %
l
u.
\n
"
,
iface
,
refcount
);
if
(
refcount
==
1
)
if
(
refcount
==
1
)
{
{
...
@@ -68,7 +68,7 @@ static ULONG WINAPI d3d8_vertexbuffer_Release(IDirect3DVertexBuffer8 *iface)
...
@@ -68,7 +68,7 @@ static ULONG WINAPI d3d8_vertexbuffer_Release(IDirect3DVertexBuffer8 *iface)
struct
d3d8_vertexbuffer
*
buffer
=
impl_from_IDirect3DVertexBuffer8
(
iface
);
struct
d3d8_vertexbuffer
*
buffer
=
impl_from_IDirect3DVertexBuffer8
(
iface
);
ULONG
refcount
=
InterlockedDecrement
(
&
buffer
->
resource
.
refcount
);
ULONG
refcount
=
InterlockedDecrement
(
&
buffer
->
resource
.
refcount
);
TRACE
(
"%p decreasing refcount to %u.
\n
"
,
iface
,
refcount
);
TRACE
(
"%p decreasing refcount to %
l
u.
\n
"
,
iface
,
refcount
);
if
(
!
refcount
)
if
(
!
refcount
)
{
{
...
@@ -106,7 +106,7 @@ static HRESULT WINAPI d3d8_vertexbuffer_SetPrivateData(IDirect3DVertexBuffer8 *i
...
@@ -106,7 +106,7 @@ static HRESULT WINAPI d3d8_vertexbuffer_SetPrivateData(IDirect3DVertexBuffer8 *i
REFGUID
guid
,
const
void
*
data
,
DWORD
data_size
,
DWORD
flags
)
REFGUID
guid
,
const
void
*
data
,
DWORD
data_size
,
DWORD
flags
)
{
{
struct
d3d8_vertexbuffer
*
buffer
=
impl_from_IDirect3DVertexBuffer8
(
iface
);
struct
d3d8_vertexbuffer
*
buffer
=
impl_from_IDirect3DVertexBuffer8
(
iface
);
TRACE
(
"iface %p, guid %s, data %p, data_size %
u, flags %#
x.
\n
"
,
TRACE
(
"iface %p, guid %s, data %p, data_size %
lu, flags %#l
x.
\n
"
,
iface
,
debugstr_guid
(
guid
),
data
,
data_size
,
flags
);
iface
,
debugstr_guid
(
guid
),
data
,
data_size
,
flags
);
return
d3d8_resource_set_private_data
(
&
buffer
->
resource
,
guid
,
data
,
data_size
,
flags
);
return
d3d8_resource_set_private_data
(
&
buffer
->
resource
,
guid
,
data
,
data_size
,
flags
);
...
@@ -136,7 +136,7 @@ static DWORD WINAPI d3d8_vertexbuffer_SetPriority(IDirect3DVertexBuffer8 *iface,
...
@@ -136,7 +136,7 @@ static DWORD WINAPI d3d8_vertexbuffer_SetPriority(IDirect3DVertexBuffer8 *iface,
struct
wined3d_resource
*
resource
;
struct
wined3d_resource
*
resource
;
DWORD
previous
;
DWORD
previous
;
TRACE
(
"iface %p, priority %u.
\n
"
,
iface
,
priority
);
TRACE
(
"iface %p, priority %
l
u.
\n
"
,
iface
,
priority
);
wined3d_mutex_lock
();
wined3d_mutex_lock
();
resource
=
wined3d_buffer_get_resource
(
buffer
->
wined3d_buffer
);
resource
=
wined3d_buffer_get_resource
(
buffer
->
wined3d_buffer
);
...
@@ -189,7 +189,7 @@ static HRESULT WINAPI d3d8_vertexbuffer_Lock(IDirect3DVertexBuffer8 *iface, UINT
...
@@ -189,7 +189,7 @@ static HRESULT WINAPI d3d8_vertexbuffer_Lock(IDirect3DVertexBuffer8 *iface, UINT
struct
wined3d_box
wined3d_box
=
{
0
};
struct
wined3d_box
wined3d_box
=
{
0
};
HRESULT
hr
;
HRESULT
hr
;
TRACE
(
"iface %p, offset %u, size %u, data %p, flags %#x.
\n
"
,
TRACE
(
"iface %p, offset %u, size %u, data %p, flags %#
l
x.
\n
"
,
iface
,
offset
,
size
,
data
,
flags
);
iface
,
offset
,
size
,
data
,
flags
);
wined3d_box
.
left
=
offset
;
wined3d_box
.
left
=
offset
;
...
@@ -324,7 +324,7 @@ HRESULT vertexbuffer_init(struct d3d8_vertexbuffer *buffer, struct d3d8_device *
...
@@ -324,7 +324,7 @@ HRESULT vertexbuffer_init(struct d3d8_vertexbuffer *buffer, struct d3d8_device *
wined3d_mutex_unlock
();
wined3d_mutex_unlock
();
if
(
FAILED
(
hr
))
if
(
FAILED
(
hr
))
{
{
WARN
(
"Failed to create wined3d buffer, hr %#x.
\n
"
,
hr
);
WARN
(
"Failed to create wined3d buffer, hr %#
l
x.
\n
"
,
hr
);
return
hr
;
return
hr
;
}
}
...
@@ -372,7 +372,7 @@ static ULONG WINAPI d3d8_indexbuffer_AddRef(IDirect3DIndexBuffer8 *iface)
...
@@ -372,7 +372,7 @@ static ULONG WINAPI d3d8_indexbuffer_AddRef(IDirect3DIndexBuffer8 *iface)
struct
d3d8_indexbuffer
*
buffer
=
impl_from_IDirect3DIndexBuffer8
(
iface
);
struct
d3d8_indexbuffer
*
buffer
=
impl_from_IDirect3DIndexBuffer8
(
iface
);
ULONG
refcount
=
InterlockedIncrement
(
&
buffer
->
resource
.
refcount
);
ULONG
refcount
=
InterlockedIncrement
(
&
buffer
->
resource
.
refcount
);
TRACE
(
"%p increasing refcount to %u.
\n
"
,
iface
,
refcount
);
TRACE
(
"%p increasing refcount to %
l
u.
\n
"
,
iface
,
refcount
);
if
(
refcount
==
1
)
if
(
refcount
==
1
)
{
{
...
@@ -388,7 +388,7 @@ static ULONG WINAPI d3d8_indexbuffer_Release(IDirect3DIndexBuffer8 *iface)
...
@@ -388,7 +388,7 @@ static ULONG WINAPI d3d8_indexbuffer_Release(IDirect3DIndexBuffer8 *iface)
struct
d3d8_indexbuffer
*
buffer
=
impl_from_IDirect3DIndexBuffer8
(
iface
);
struct
d3d8_indexbuffer
*
buffer
=
impl_from_IDirect3DIndexBuffer8
(
iface
);
ULONG
refcount
=
InterlockedDecrement
(
&
buffer
->
resource
.
refcount
);
ULONG
refcount
=
InterlockedDecrement
(
&
buffer
->
resource
.
refcount
);
TRACE
(
"%p decreasing refcount to %u.
\n
"
,
iface
,
refcount
);
TRACE
(
"%p decreasing refcount to %
l
u.
\n
"
,
iface
,
refcount
);
if
(
!
refcount
)
if
(
!
refcount
)
{
{
...
@@ -422,7 +422,7 @@ static HRESULT WINAPI d3d8_indexbuffer_SetPrivateData(IDirect3DIndexBuffer8 *ifa
...
@@ -422,7 +422,7 @@ static HRESULT WINAPI d3d8_indexbuffer_SetPrivateData(IDirect3DIndexBuffer8 *ifa
REFGUID
guid
,
const
void
*
data
,
DWORD
data_size
,
DWORD
flags
)
REFGUID
guid
,
const
void
*
data
,
DWORD
data_size
,
DWORD
flags
)
{
{
struct
d3d8_indexbuffer
*
buffer
=
impl_from_IDirect3DIndexBuffer8
(
iface
);
struct
d3d8_indexbuffer
*
buffer
=
impl_from_IDirect3DIndexBuffer8
(
iface
);
TRACE
(
"iface %p, guid %s, data %p, data_size %
u, flags %#
x.
\n
"
,
TRACE
(
"iface %p, guid %s, data %p, data_size %
lu, flags %#l
x.
\n
"
,
iface
,
debugstr_guid
(
guid
),
data
,
data_size
,
flags
);
iface
,
debugstr_guid
(
guid
),
data
,
data_size
,
flags
);
return
d3d8_resource_set_private_data
(
&
buffer
->
resource
,
guid
,
data
,
data_size
,
flags
);
return
d3d8_resource_set_private_data
(
&
buffer
->
resource
,
guid
,
data
,
data_size
,
flags
);
...
@@ -452,7 +452,7 @@ static DWORD WINAPI d3d8_indexbuffer_SetPriority(IDirect3DIndexBuffer8 *iface, D
...
@@ -452,7 +452,7 @@ static DWORD WINAPI d3d8_indexbuffer_SetPriority(IDirect3DIndexBuffer8 *iface, D
struct
wined3d_resource
*
resource
;
struct
wined3d_resource
*
resource
;
DWORD
previous
;
DWORD
previous
;
TRACE
(
"iface %p, priority %u.
\n
"
,
iface
,
priority
);
TRACE
(
"iface %p, priority %
l
u.
\n
"
,
iface
,
priority
);
wined3d_mutex_lock
();
wined3d_mutex_lock
();
resource
=
wined3d_buffer_get_resource
(
buffer
->
wined3d_buffer
);
resource
=
wined3d_buffer_get_resource
(
buffer
->
wined3d_buffer
);
...
@@ -505,7 +505,7 @@ static HRESULT WINAPI d3d8_indexbuffer_Lock(IDirect3DIndexBuffer8 *iface, UINT o
...
@@ -505,7 +505,7 @@ static HRESULT WINAPI d3d8_indexbuffer_Lock(IDirect3DIndexBuffer8 *iface, UINT o
struct
wined3d_box
wined3d_box
=
{
0
};
struct
wined3d_box
wined3d_box
=
{
0
};
HRESULT
hr
;
HRESULT
hr
;
TRACE
(
"iface %p, offset %u, size %u, data %p, flags %#x.
\n
"
,
TRACE
(
"iface %p, offset %u, size %u, data %p, flags %#
l
x.
\n
"
,
iface
,
offset
,
size
,
data
,
flags
);
iface
,
offset
,
size
,
data
,
flags
);
wined3d_box
.
left
=
offset
;
wined3d_box
.
left
=
offset
;
...
@@ -624,7 +624,7 @@ HRESULT indexbuffer_init(struct d3d8_indexbuffer *buffer, struct d3d8_device *de
...
@@ -624,7 +624,7 @@ HRESULT indexbuffer_init(struct d3d8_indexbuffer *buffer, struct d3d8_device *de
wined3d_mutex_unlock
();
wined3d_mutex_unlock
();
if
(
FAILED
(
hr
))
if
(
FAILED
(
hr
))
{
{
WARN
(
"Failed to create wined3d buffer, hr %#x.
\n
"
,
hr
);
WARN
(
"Failed to create wined3d buffer, hr %#
l
x.
\n
"
,
hr
);
return
hr
;
return
hr
;
}
}
...
...
dlls/d3d8/device.c
View file @
52c35814
This diff is collapsed.
Click to expand it.
dlls/d3d8/directx.c
View file @
52c35814
...
@@ -52,7 +52,7 @@ static ULONG WINAPI d3d8_AddRef(IDirect3D8 *iface)
...
@@ -52,7 +52,7 @@ static ULONG WINAPI d3d8_AddRef(IDirect3D8 *iface)
struct
d3d8
*
d3d8
=
impl_from_IDirect3D8
(
iface
);
struct
d3d8
*
d3d8
=
impl_from_IDirect3D8
(
iface
);
ULONG
refcount
=
InterlockedIncrement
(
&
d3d8
->
refcount
);
ULONG
refcount
=
InterlockedIncrement
(
&
d3d8
->
refcount
);
TRACE
(
"%p increasing refcount to %u.
\n
"
,
iface
,
refcount
);
TRACE
(
"%p increasing refcount to %
l
u.
\n
"
,
iface
,
refcount
);
return
refcount
;
return
refcount
;
}
}
...
@@ -62,7 +62,7 @@ static ULONG WINAPI d3d8_Release(IDirect3D8 *iface)
...
@@ -62,7 +62,7 @@ static ULONG WINAPI d3d8_Release(IDirect3D8 *iface)
struct
d3d8
*
d3d8
=
impl_from_IDirect3D8
(
iface
);
struct
d3d8
*
d3d8
=
impl_from_IDirect3D8
(
iface
);
ULONG
refcount
=
InterlockedDecrement
(
&
d3d8
->
refcount
);
ULONG
refcount
=
InterlockedDecrement
(
&
d3d8
->
refcount
);
TRACE
(
"%p decreasing refcount to %u.
\n
"
,
iface
,
refcount
);
TRACE
(
"%p decreasing refcount to %
l
u.
\n
"
,
iface
,
refcount
);
if
(
!
refcount
)
if
(
!
refcount
)
{
{
...
@@ -109,7 +109,7 @@ static HRESULT WINAPI d3d8_GetAdapterIdentifier(IDirect3D8 *iface, UINT adapter,
...
@@ -109,7 +109,7 @@ static HRESULT WINAPI d3d8_GetAdapterIdentifier(IDirect3D8 *iface, UINT adapter,
unsigned
int
output_idx
;
unsigned
int
output_idx
;
HRESULT
hr
;
HRESULT
hr
;
TRACE
(
"iface %p, adapter %u, flags %#x, identifier %p.
\n
"
,
TRACE
(
"iface %p, adapter %u, flags %#
l
x, identifier %p.
\n
"
,
iface
,
adapter
,
flags
,
identifier
);
iface
,
adapter
,
flags
,
identifier
);
output_idx
=
adapter
;
output_idx
=
adapter
;
...
@@ -253,7 +253,7 @@ static HRESULT WINAPI d3d8_CheckDeviceFormat(IDirect3D8 *iface, UINT adapter, D3
...
@@ -253,7 +253,7 @@ static HRESULT WINAPI d3d8_CheckDeviceFormat(IDirect3D8 *iface, UINT adapter, D3
unsigned
int
output_idx
;
unsigned
int
output_idx
;
HRESULT
hr
;
HRESULT
hr
;
TRACE
(
"iface %p, adapter %u, device_type %#x, adapter_format %#x, usage %#x, resource_type %#x, format %#x.
\n
"
,
TRACE
(
"iface %p, adapter %u, device_type %#x, adapter_format %#x, usage %#
l
x, resource_type %#x, format %#x.
\n
"
,
iface
,
adapter
,
device_type
,
adapter_format
,
usage
,
resource_type
,
format
);
iface
,
adapter
,
device_type
,
adapter_format
,
usage
,
resource_type
,
format
);
output_idx
=
adapter
;
output_idx
=
adapter
;
...
@@ -299,7 +299,7 @@ static HRESULT WINAPI d3d8_CheckDeviceFormat(IDirect3D8 *iface, UINT adapter, D3
...
@@ -299,7 +299,7 @@ static HRESULT WINAPI d3d8_CheckDeviceFormat(IDirect3D8 *iface, UINT adapter, D3
wined3d_adapter
=
wined3d_output_get_adapter
(
d3d8
->
wined3d_outputs
[
output_idx
]);
wined3d_adapter
=
wined3d_output_get_adapter
(
d3d8
->
wined3d_outputs
[
output_idx
]);
if
(
format
==
D3DFMT_RESZ
&&
resource_type
==
D3DRTYPE_SURFACE
&&
usage
==
D3DUSAGE_RENDERTARGET
)
if
(
format
==
D3DFMT_RESZ
&&
resource_type
==
D3DRTYPE_SURFACE
&&
usage
==
D3DUSAGE_RENDERTARGET
)
{
{
DWORD
levels
;
unsigned
int
levels
;
hr
=
wined3d_check_device_multisample_type
(
wined3d_adapter
,
wined3d_device_type_from_d3d
(
device_type
),
hr
=
wined3d_check_device_multisample_type
(
wined3d_adapter
,
wined3d_device_type_from_d3d
(
device_type
),
WINED3DFMT_D24_UNORM_S8_UINT
,
FALSE
,
WINED3D_MULTISAMPLE_NON_MASKABLE
,
&
levels
);
WINED3DFMT_D24_UNORM_S8_UINT
,
FALSE
,
WINED3D_MULTISAMPLE_NON_MASKABLE
,
&
levels
);
...
@@ -414,7 +414,7 @@ static HMONITOR WINAPI d3d8_GetAdapterMonitor(IDirect3D8 *iface, UINT adapter)
...
@@ -414,7 +414,7 @@ static HMONITOR WINAPI d3d8_GetAdapterMonitor(IDirect3D8 *iface, UINT adapter)
if
(
FAILED
(
hr
))
if
(
FAILED
(
hr
))
{
{
WARN
(
"Failed to get output desc, hr %#x.
\n
"
,
hr
);
WARN
(
"Failed to get output desc, hr %#
l
x.
\n
"
,
hr
);
return
NULL
;
return
NULL
;
}
}
...
@@ -429,7 +429,7 @@ static HRESULT WINAPI d3d8_CreateDevice(IDirect3D8 *iface, UINT adapter,
...
@@ -429,7 +429,7 @@ static HRESULT WINAPI d3d8_CreateDevice(IDirect3D8 *iface, UINT adapter,
struct
d3d8_device
*
object
;
struct
d3d8_device
*
object
;
HRESULT
hr
;
HRESULT
hr
;
TRACE
(
"iface %p, adapter %u, device_type %#x, focus_window %p, flags %#x, parameters %p, device %p.
\n
"
,
TRACE
(
"iface %p, adapter %u, device_type %#x, focus_window %p, flags %#
l
x, parameters %p, device %p.
\n
"
,
iface
,
adapter
,
device_type
,
focus_window
,
flags
,
parameters
,
device
);
iface
,
adapter
,
device_type
,
focus_window
,
flags
,
parameters
,
device
);
if
(
!
(
object
=
heap_alloc_zero
(
sizeof
(
*
object
))))
if
(
!
(
object
=
heap_alloc_zero
(
sizeof
(
*
object
))))
...
@@ -438,7 +438,7 @@ static HRESULT WINAPI d3d8_CreateDevice(IDirect3D8 *iface, UINT adapter,
...
@@ -438,7 +438,7 @@ static HRESULT WINAPI d3d8_CreateDevice(IDirect3D8 *iface, UINT adapter,
hr
=
device_init
(
object
,
d3d8
,
d3d8
->
wined3d
,
adapter
,
device_type
,
focus_window
,
flags
,
parameters
);
hr
=
device_init
(
object
,
d3d8
,
d3d8
->
wined3d
,
adapter
,
device_type
,
focus_window
,
flags
,
parameters
);
if
(
FAILED
(
hr
))
if
(
FAILED
(
hr
))
{
{
WARN
(
"Failed to initialize device, hr %#x.
\n
"
,
hr
);
WARN
(
"Failed to initialize device, hr %#
l
x.
\n
"
,
hr
);
heap_free
(
object
);
heap_free
(
object
);
return
hr
;
return
hr
;
}
}
...
...
dlls/d3d8/shader.c
View file @
52c35814
...
@@ -55,7 +55,7 @@ static HRESULT d3d8_vertexshader_create_vertexdeclaration(struct d3d8_device *de
...
@@ -55,7 +55,7 @@ static HRESULT d3d8_vertexshader_create_vertexdeclaration(struct d3d8_device *de
struct
d3d8_vertex_declaration
*
object
;
struct
d3d8_vertex_declaration
*
object
;
HRESULT
hr
;
HRESULT
hr
;
TRACE
(
"device %p, declaration %p, shader_handle %#x, decl_ptr %p.
\n
"
,
TRACE
(
"device %p, declaration %p, shader_handle %#
l
x, decl_ptr %p.
\n
"
,
device
,
declaration
,
shader_handle
,
decl_ptr
);
device
,
declaration
,
shader_handle
,
decl_ptr
);
if
(
!
(
object
=
heap_alloc_zero
(
sizeof
(
*
object
))))
if
(
!
(
object
=
heap_alloc_zero
(
sizeof
(
*
object
))))
...
@@ -64,7 +64,7 @@ static HRESULT d3d8_vertexshader_create_vertexdeclaration(struct d3d8_device *de
...
@@ -64,7 +64,7 @@ static HRESULT d3d8_vertexshader_create_vertexdeclaration(struct d3d8_device *de
hr
=
d3d8_vertex_declaration_init
(
object
,
device
,
declaration
,
shader_handle
);
hr
=
d3d8_vertex_declaration_init
(
object
,
device
,
declaration
,
shader_handle
);
if
(
FAILED
(
hr
))
if
(
FAILED
(
hr
))
{
{
WARN
(
"Failed to initialize vertex declaration, hr %#x.
\n
"
,
hr
);
WARN
(
"Failed to initialize vertex declaration, hr %#
l
x.
\n
"
,
hr
);
heap_free
(
object
);
heap_free
(
object
);
return
hr
;
return
hr
;
}
}
...
@@ -103,7 +103,7 @@ HRESULT d3d8_vertex_shader_init(struct d3d8_vertex_shader *shader, struct d3d8_d
...
@@ -103,7 +103,7 @@ HRESULT d3d8_vertex_shader_init(struct d3d8_vertex_shader *shader, struct d3d8_d
hr
=
d3d8_vertexshader_create_vertexdeclaration
(
device
,
declaration
,
shader_handle
,
&
shader
->
vertex_declaration
);
hr
=
d3d8_vertexshader_create_vertexdeclaration
(
device
,
declaration
,
shader_handle
,
&
shader
->
vertex_declaration
);
if
(
FAILED
(
hr
))
if
(
FAILED
(
hr
))
{
{
WARN
(
"Failed to create vertex declaration, hr %#x.
\n
"
,
hr
);
WARN
(
"Failed to create vertex declaration, hr %#
l
x.
\n
"
,
hr
);
return
hr
;
return
hr
;
}
}
...
@@ -112,7 +112,7 @@ HRESULT d3d8_vertex_shader_init(struct d3d8_vertex_shader *shader, struct d3d8_d
...
@@ -112,7 +112,7 @@ HRESULT d3d8_vertex_shader_init(struct d3d8_vertex_shader *shader, struct d3d8_d
struct
wined3d_shader_desc
desc
;
struct
wined3d_shader_desc
desc
;
if
(
usage
)
if
(
usage
)
FIXME
(
"Usage %#x not implemented.
\n
"
,
usage
);
FIXME
(
"Usage %#
l
x not implemented.
\n
"
,
usage
);
desc
.
byte_code
=
byte_code
;
desc
.
byte_code
=
byte_code
;
desc
.
byte_code_size
=
~
(
size_t
)
0
;
desc
.
byte_code_size
=
~
(
size_t
)
0
;
...
@@ -123,7 +123,7 @@ HRESULT d3d8_vertex_shader_init(struct d3d8_vertex_shader *shader, struct d3d8_d
...
@@ -123,7 +123,7 @@ HRESULT d3d8_vertex_shader_init(struct d3d8_vertex_shader *shader, struct d3d8_d
wined3d_mutex_unlock
();
wined3d_mutex_unlock
();
if
(
FAILED
(
hr
))
if
(
FAILED
(
hr
))
{
{
WARN
(
"Failed to create wined3d vertex shader, hr %#x.
\n
"
,
hr
);
WARN
(
"Failed to create wined3d vertex shader, hr %#
l
x.
\n
"
,
hr
);
d3d8_vertex_declaration_destroy
(
shader
->
vertex_declaration
);
d3d8_vertex_declaration_destroy
(
shader
->
vertex_declaration
);
return
hr
;
return
hr
;
}
}
...
@@ -170,7 +170,7 @@ HRESULT d3d8_pixel_shader_init(struct d3d8_pixel_shader *shader, struct d3d8_dev
...
@@ -170,7 +170,7 @@ HRESULT d3d8_pixel_shader_init(struct d3d8_pixel_shader *shader, struct d3d8_dev
wined3d_mutex_unlock
();
wined3d_mutex_unlock
();
if
(
FAILED
(
hr
))
if
(
FAILED
(
hr
))
{
{
WARN
(
"Failed to create wined3d pixel shader, hr %#x.
\n
"
,
hr
);
WARN
(
"Failed to create wined3d pixel shader, hr %#
l
x.
\n
"
,
hr
);
return
hr
;
return
hr
;
}
}
...
...
dlls/d3d8/surface.c
View file @
52c35814
...
@@ -60,7 +60,7 @@ static ULONG WINAPI d3d8_surface_AddRef(IDirect3DSurface8 *iface)
...
@@ -60,7 +60,7 @@ static ULONG WINAPI d3d8_surface_AddRef(IDirect3DSurface8 *iface)
}
}
refcount
=
InterlockedIncrement
(
&
surface
->
resource
.
refcount
);
refcount
=
InterlockedIncrement
(
&
surface
->
resource
.
refcount
);
TRACE
(
"%p increasing refcount to %u.
\n
"
,
iface
,
refcount
);
TRACE
(
"%p increasing refcount to %
l
u.
\n
"
,
iface
,
refcount
);
if
(
refcount
==
1
)
if
(
refcount
==
1
)
{
{
...
@@ -94,7 +94,7 @@ static ULONG WINAPI d3d8_surface_Release(IDirect3DSurface8 *iface)
...
@@ -94,7 +94,7 @@ static ULONG WINAPI d3d8_surface_Release(IDirect3DSurface8 *iface)
}
}
refcount
=
InterlockedDecrement
(
&
surface
->
resource
.
refcount
);
refcount
=
InterlockedDecrement
(
&
surface
->
resource
.
refcount
);
TRACE
(
"%p decreasing refcount to %u.
\n
"
,
iface
,
refcount
);
TRACE
(
"%p decreasing refcount to %
l
u.
\n
"
,
iface
,
refcount
);
if
(
!
refcount
)
if
(
!
refcount
)
{
{
...
@@ -132,7 +132,7 @@ static HRESULT WINAPI d3d8_surface_SetPrivateData(IDirect3DSurface8 *iface, REFG
...
@@ -132,7 +132,7 @@ static HRESULT WINAPI d3d8_surface_SetPrivateData(IDirect3DSurface8 *iface, REFG
const
void
*
data
,
DWORD
data_size
,
DWORD
flags
)
const
void
*
data
,
DWORD
data_size
,
DWORD
flags
)
{
{
struct
d3d8_surface
*
surface
=
impl_from_IDirect3DSurface8
(
iface
);
struct
d3d8_surface
*
surface
=
impl_from_IDirect3DSurface8
(
iface
);
TRACE
(
"iface %p, guid %s, data %p, data_size %
u, flags %#
x.
\n
"
,
TRACE
(
"iface %p, guid %s, data %p, data_size %
lu, flags %#l
x.
\n
"
,
iface
,
debugstr_guid
(
guid
),
data
,
data_size
,
flags
);
iface
,
debugstr_guid
(
guid
),
data
,
data_size
,
flags
);
return
d3d8_resource_set_private_data
(
&
surface
->
resource
,
guid
,
data
,
data_size
,
flags
);
return
d3d8_resource_set_private_data
(
&
surface
->
resource
,
guid
,
data
,
data_size
,
flags
);
...
@@ -205,7 +205,7 @@ static HRESULT WINAPI d3d8_surface_LockRect(IDirect3DSurface8 *iface,
...
@@ -205,7 +205,7 @@ static HRESULT WINAPI d3d8_surface_LockRect(IDirect3DSurface8 *iface,
HRESULT
hr
;
HRESULT
hr
;
D3DRESOURCETYPE
type
;
D3DRESOURCETYPE
type
;
TRACE
(
"iface %p, locked_rect %p, rect %s, flags %#x.
\n
"
,
TRACE
(
"iface %p, locked_rect %p, rect %s, flags %#
l
x.
\n
"
,
iface
,
locked_rect
,
wine_dbgstr_rect
(
rect
),
flags
);
iface
,
locked_rect
,
wine_dbgstr_rect
(
rect
),
flags
);
wined3d_mutex_lock
();
wined3d_mutex_lock
();
...
@@ -376,7 +376,7 @@ struct wined3d_rendertarget_view *d3d8_surface_acquire_rendertarget_view(struct
...
@@ -376,7 +376,7 @@ struct wined3d_rendertarget_view *d3d8_surface_acquire_rendertarget_view(struct
if
(
FAILED
(
hr
=
wined3d_rendertarget_view_create_from_sub_resource
(
surface
->
wined3d_texture
,
if
(
FAILED
(
hr
=
wined3d_rendertarget_view_create_from_sub_resource
(
surface
->
wined3d_texture
,
surface
->
sub_resource_idx
,
surface
,
&
d3d8_view_wined3d_parent_ops
,
&
surface
->
wined3d_rtv
)))
surface
->
sub_resource_idx
,
surface
,
&
d3d8_view_wined3d_parent_ops
,
&
surface
->
wined3d_rtv
)))
{
{
ERR
(
"Failed to create rendertarget view, hr %#x.
\n
"
,
hr
);
ERR
(
"Failed to create rendertarget view, hr %#
l
x.
\n
"
,
hr
);
d3d8_surface_Release
(
&
surface
->
IDirect3DSurface8_iface
);
d3d8_surface_Release
(
&
surface
->
IDirect3DSurface8_iface
);
return
NULL
;
return
NULL
;
}
}
...
...
dlls/d3d8/swapchain.c
View file @
52c35814
...
@@ -50,7 +50,7 @@ static ULONG WINAPI d3d8_swapchain_AddRef(IDirect3DSwapChain8 *iface)
...
@@ -50,7 +50,7 @@ static ULONG WINAPI d3d8_swapchain_AddRef(IDirect3DSwapChain8 *iface)
struct
d3d8_swapchain
*
swapchain
=
impl_from_IDirect3DSwapChain8
(
iface
);
struct
d3d8_swapchain
*
swapchain
=
impl_from_IDirect3DSwapChain8
(
iface
);
ULONG
ref
=
InterlockedIncrement
(
&
swapchain
->
refcount
);
ULONG
ref
=
InterlockedIncrement
(
&
swapchain
->
refcount
);
TRACE
(
"%p increasing refcount to %u.
\n
"
,
iface
,
ref
);
TRACE
(
"%p increasing refcount to %
l
u.
\n
"
,
iface
,
ref
);
if
(
ref
==
1
)
if
(
ref
==
1
)
{
{
...
@@ -67,7 +67,7 @@ static ULONG WINAPI d3d8_swapchain_Release(IDirect3DSwapChain8 *iface)
...
@@ -67,7 +67,7 @@ static ULONG WINAPI d3d8_swapchain_Release(IDirect3DSwapChain8 *iface)
struct
d3d8_swapchain
*
swapchain
=
impl_from_IDirect3DSwapChain8
(
iface
);
struct
d3d8_swapchain
*
swapchain
=
impl_from_IDirect3DSwapChain8
(
iface
);
ULONG
ref
=
InterlockedDecrement
(
&
swapchain
->
refcount
);
ULONG
ref
=
InterlockedDecrement
(
&
swapchain
->
refcount
);
TRACE
(
"%p decreasing refcount to %u.
\n
"
,
iface
,
ref
);
TRACE
(
"%p decreasing refcount to %
l
u.
\n
"
,
iface
,
ref
);
if
(
!
ref
)
if
(
!
ref
)
{
{
...
@@ -180,7 +180,7 @@ static HRESULT swapchain_init(struct d3d8_swapchain *swapchain, struct d3d8_devi
...
@@ -180,7 +180,7 @@ static HRESULT swapchain_init(struct d3d8_swapchain *swapchain, struct d3d8_devi
if
(
FAILED
(
hr
=
wined3d_swapchain_create
(
device
->
wined3d_device
,
desc
,
&
swapchain
->
state_parent
,
if
(
FAILED
(
hr
=
wined3d_swapchain_create
(
device
->
wined3d_device
,
desc
,
&
swapchain
->
state_parent
,
swapchain
,
&
d3d8_swapchain_wined3d_parent_ops
,
&
swapchain
->
wined3d_swapchain
)))
swapchain
,
&
d3d8_swapchain_wined3d_parent_ops
,
&
swapchain
->
wined3d_swapchain
)))
{
{
WARN
(
"Failed to create wined3d swapchain, hr %#x.
\n
"
,
hr
);
WARN
(
"Failed to create wined3d swapchain, hr %#
l
x.
\n
"
,
hr
);
return
hr
;
return
hr
;
}
}
...
@@ -201,7 +201,7 @@ HRESULT d3d8_swapchain_create(struct d3d8_device *device, struct wined3d_swapcha
...
@@ -201,7 +201,7 @@ HRESULT d3d8_swapchain_create(struct d3d8_device *device, struct wined3d_swapcha
if
(
FAILED
(
hr
=
swapchain_init
(
object
,
device
,
desc
,
swap_interval
)))
if
(
FAILED
(
hr
=
swapchain_init
(
object
,
device
,
desc
,
swap_interval
)))
{
{
WARN
(
"Failed to initialize swapchain, hr %#x.
\n
"
,
hr
);
WARN
(
"Failed to initialize swapchain, hr %#
l
x.
\n
"
,
hr
);
heap_free
(
object
);
heap_free
(
object
);
return
hr
;
return
hr
;
}
}
...
...
dlls/d3d8/texture.c
View file @
52c35814
...
@@ -24,7 +24,7 @@ static ULONG d3d8_texture_incref(struct d3d8_texture *texture)
...
@@ -24,7 +24,7 @@ static ULONG d3d8_texture_incref(struct d3d8_texture *texture)
{
{
ULONG
ref
=
InterlockedIncrement
(
&
texture
->
resource
.
refcount
);
ULONG
ref
=
InterlockedIncrement
(
&
texture
->
resource
.
refcount
);
TRACE
(
"%p increasing refcount to %u.
\n
"
,
texture
,
ref
);
TRACE
(
"%p increasing refcount to %
l
u.
\n
"
,
texture
,
ref
);
if
(
ref
==
1
)
if
(
ref
==
1
)
{
{
...
@@ -47,7 +47,7 @@ static ULONG d3d8_texture_decref(struct d3d8_texture *texture)
...
@@ -47,7 +47,7 @@ static ULONG d3d8_texture_decref(struct d3d8_texture *texture)
{
{
ULONG
ref
=
InterlockedDecrement
(
&
texture
->
resource
.
refcount
);
ULONG
ref
=
InterlockedDecrement
(
&
texture
->
resource
.
refcount
);
TRACE
(
"%p decreasing refcount to %u.
\n
"
,
texture
,
ref
);
TRACE
(
"%p decreasing refcount to %
l
u.
\n
"
,
texture
,
ref
);
if
(
!
ref
)
if
(
!
ref
)
{
{
...
@@ -147,7 +147,7 @@ static HRESULT WINAPI d3d8_texture_2d_SetPrivateData(IDirect3DTexture8 *iface,
...
@@ -147,7 +147,7 @@ static HRESULT WINAPI d3d8_texture_2d_SetPrivateData(IDirect3DTexture8 *iface,
REFGUID
guid
,
const
void
*
data
,
DWORD
data_size
,
DWORD
flags
)
REFGUID
guid
,
const
void
*
data
,
DWORD
data_size
,
DWORD
flags
)
{
{
struct
d3d8_texture
*
texture
=
impl_from_IDirect3DTexture8
(
iface
);
struct
d3d8_texture
*
texture
=
impl_from_IDirect3DTexture8
(
iface
);
TRACE
(
"iface %p, guid %s, data %p, data_size %
u, flags %#
x.
\n
"
,
TRACE
(
"iface %p, guid %s, data %p, data_size %
lu, flags %#l
x.
\n
"
,
iface
,
debugstr_guid
(
guid
),
data
,
data_size
,
flags
);
iface
,
debugstr_guid
(
guid
),
data
,
data_size
,
flags
);
return
d3d8_resource_set_private_data
(
&
texture
->
resource
,
guid
,
data
,
data_size
,
flags
);
return
d3d8_resource_set_private_data
(
&
texture
->
resource
,
guid
,
data
,
data_size
,
flags
);
...
@@ -177,7 +177,7 @@ static DWORD WINAPI d3d8_texture_2d_SetPriority(IDirect3DTexture8 *iface, DWORD
...
@@ -177,7 +177,7 @@ static DWORD WINAPI d3d8_texture_2d_SetPriority(IDirect3DTexture8 *iface, DWORD
struct
wined3d_resource
*
resource
;
struct
wined3d_resource
*
resource
;
DWORD
ret
;
DWORD
ret
;
TRACE
(
"iface %p, priority %u.
\n
"
,
iface
,
priority
);
TRACE
(
"iface %p, priority %
l
u.
\n
"
,
iface
,
priority
);
wined3d_mutex_lock
();
wined3d_mutex_lock
();
resource
=
wined3d_texture_get_resource
(
d3d8_texture_get_draw_texture
(
texture
));
resource
=
wined3d_texture_get_resource
(
d3d8_texture_get_draw_texture
(
texture
));
...
@@ -224,7 +224,7 @@ static DWORD WINAPI d3d8_texture_2d_SetLOD(IDirect3DTexture8 *iface, DWORD lod)
...
@@ -224,7 +224,7 @@ static DWORD WINAPI d3d8_texture_2d_SetLOD(IDirect3DTexture8 *iface, DWORD lod)
struct
d3d8_texture
*
texture
=
impl_from_IDirect3DTexture8
(
iface
);
struct
d3d8_texture
*
texture
=
impl_from_IDirect3DTexture8
(
iface
);
DWORD
ret
;
DWORD
ret
;
TRACE
(
"iface %p, lod %u.
\n
"
,
iface
,
lod
);
TRACE
(
"iface %p, lod %
l
u.
\n
"
,
iface
,
lod
);
wined3d_mutex_lock
();
wined3d_mutex_lock
();
ret
=
wined3d_texture_set_lod
(
d3d8_texture_get_draw_texture
(
texture
),
lod
);
ret
=
wined3d_texture_set_lod
(
d3d8_texture_get_draw_texture
(
texture
),
lod
);
...
@@ -315,7 +315,7 @@ static HRESULT WINAPI d3d8_texture_2d_LockRect(IDirect3DTexture8 *iface, UINT le
...
@@ -315,7 +315,7 @@ static HRESULT WINAPI d3d8_texture_2d_LockRect(IDirect3DTexture8 *iface, UINT le
struct
d3d8_surface
*
surface_impl
;
struct
d3d8_surface
*
surface_impl
;
HRESULT
hr
;
HRESULT
hr
;
TRACE
(
"iface %p, level %u, locked_rect %p, rect %p, flags %#x.
\n
"
,
TRACE
(
"iface %p, level %u, locked_rect %p, rect %p, flags %#
l
x.
\n
"
,
iface
,
level
,
locked_rect
,
rect
,
flags
);
iface
,
level
,
locked_rect
,
rect
,
flags
);
wined3d_mutex_lock
();
wined3d_mutex_lock
();
...
@@ -448,7 +448,7 @@ static HRESULT WINAPI d3d8_texture_cube_SetPrivateData(IDirect3DCubeTexture8 *if
...
@@ -448,7 +448,7 @@ static HRESULT WINAPI d3d8_texture_cube_SetPrivateData(IDirect3DCubeTexture8 *if
REFGUID
guid
,
const
void
*
data
,
DWORD
data_size
,
DWORD
flags
)
REFGUID
guid
,
const
void
*
data
,
DWORD
data_size
,
DWORD
flags
)
{
{
struct
d3d8_texture
*
texture
=
impl_from_IDirect3DCubeTexture8
(
iface
);
struct
d3d8_texture
*
texture
=
impl_from_IDirect3DCubeTexture8
(
iface
);
TRACE
(
"iface %p, guid %s, data %p, data_size %
u, flags %#
x.
\n
"
,
TRACE
(
"iface %p, guid %s, data %p, data_size %
lu, flags %#l
x.
\n
"
,
iface
,
debugstr_guid
(
guid
),
data
,
data_size
,
flags
);
iface
,
debugstr_guid
(
guid
),
data
,
data_size
,
flags
);
return
d3d8_resource_set_private_data
(
&
texture
->
resource
,
guid
,
data
,
data_size
,
flags
);
return
d3d8_resource_set_private_data
(
&
texture
->
resource
,
guid
,
data
,
data_size
,
flags
);
...
@@ -478,7 +478,7 @@ static DWORD WINAPI d3d8_texture_cube_SetPriority(IDirect3DCubeTexture8 *iface,
...
@@ -478,7 +478,7 @@ static DWORD WINAPI d3d8_texture_cube_SetPriority(IDirect3DCubeTexture8 *iface,
struct
wined3d_resource
*
resource
;
struct
wined3d_resource
*
resource
;
DWORD
ret
;
DWORD
ret
;
TRACE
(
"iface %p, priority %u.
\n
"
,
iface
,
priority
);
TRACE
(
"iface %p, priority %
l
u.
\n
"
,
iface
,
priority
);
wined3d_mutex_lock
();
wined3d_mutex_lock
();
resource
=
wined3d_texture_get_resource
(
d3d8_texture_get_draw_texture
(
texture
));
resource
=
wined3d_texture_get_resource
(
d3d8_texture_get_draw_texture
(
texture
));
...
@@ -525,7 +525,7 @@ static DWORD WINAPI d3d8_texture_cube_SetLOD(IDirect3DCubeTexture8 *iface, DWORD
...
@@ -525,7 +525,7 @@ static DWORD WINAPI d3d8_texture_cube_SetLOD(IDirect3DCubeTexture8 *iface, DWORD
struct
d3d8_texture
*
texture
=
impl_from_IDirect3DCubeTexture8
(
iface
);
struct
d3d8_texture
*
texture
=
impl_from_IDirect3DCubeTexture8
(
iface
);
DWORD
ret
;
DWORD
ret
;
TRACE
(
"iface %p, lod %u.
\n
"
,
iface
,
lod
);
TRACE
(
"iface %p, lod %
l
u.
\n
"
,
iface
,
lod
);
wined3d_mutex_lock
();
wined3d_mutex_lock
();
ret
=
wined3d_texture_set_lod
(
d3d8_texture_get_draw_texture
(
texture
),
lod
);
ret
=
wined3d_texture_set_lod
(
d3d8_texture_get_draw_texture
(
texture
),
lod
);
...
@@ -634,7 +634,7 @@ static HRESULT WINAPI d3d8_texture_cube_LockRect(IDirect3DCubeTexture8 *iface,
...
@@ -634,7 +634,7 @@ static HRESULT WINAPI d3d8_texture_cube_LockRect(IDirect3DCubeTexture8 *iface,
UINT
sub_resource_idx
;
UINT
sub_resource_idx
;
HRESULT
hr
;
HRESULT
hr
;
TRACE
(
"iface %p, face %#x, level %u, locked_rect %p, rect %p, flags %#x.
\n
"
,
TRACE
(
"iface %p, face %#x, level %u, locked_rect %p, rect %p, flags %#
l
x.
\n
"
,
iface
,
face
,
level
,
locked_rect
,
rect
,
flags
);
iface
,
face
,
level
,
locked_rect
,
rect
,
flags
);
wined3d_mutex_lock
();
wined3d_mutex_lock
();
...
@@ -772,7 +772,7 @@ static HRESULT WINAPI d3d8_texture_3d_SetPrivateData(IDirect3DVolumeTexture8 *if
...
@@ -772,7 +772,7 @@ static HRESULT WINAPI d3d8_texture_3d_SetPrivateData(IDirect3DVolumeTexture8 *if
REFGUID
guid
,
const
void
*
data
,
DWORD
data_size
,
DWORD
flags
)
REFGUID
guid
,
const
void
*
data
,
DWORD
data_size
,
DWORD
flags
)
{
{
struct
d3d8_texture
*
texture
=
impl_from_IDirect3DVolumeTexture8
(
iface
);
struct
d3d8_texture
*
texture
=
impl_from_IDirect3DVolumeTexture8
(
iface
);
TRACE
(
"iface %p, guid %s, data %p, data_size %
u, flags %#
x.
\n
"
,
TRACE
(
"iface %p, guid %s, data %p, data_size %
lu, flags %#l
x.
\n
"
,
iface
,
debugstr_guid
(
guid
),
data
,
data_size
,
flags
);
iface
,
debugstr_guid
(
guid
),
data
,
data_size
,
flags
);
return
d3d8_resource_set_private_data
(
&
texture
->
resource
,
guid
,
data
,
data_size
,
flags
);
return
d3d8_resource_set_private_data
(
&
texture
->
resource
,
guid
,
data
,
data_size
,
flags
);
...
@@ -802,7 +802,7 @@ static DWORD WINAPI d3d8_texture_3d_SetPriority(IDirect3DVolumeTexture8 *iface,
...
@@ -802,7 +802,7 @@ static DWORD WINAPI d3d8_texture_3d_SetPriority(IDirect3DVolumeTexture8 *iface,
struct
wined3d_resource
*
resource
;
struct
wined3d_resource
*
resource
;
DWORD
ret
;
DWORD
ret
;
TRACE
(
"iface %p, priority %u.
\n
"
,
iface
,
priority
);
TRACE
(
"iface %p, priority %
l
u.
\n
"
,
iface
,
priority
);
wined3d_mutex_lock
();
wined3d_mutex_lock
();
resource
=
wined3d_texture_get_resource
(
d3d8_texture_get_draw_texture
(
texture
));
resource
=
wined3d_texture_get_resource
(
d3d8_texture_get_draw_texture
(
texture
));
...
@@ -849,7 +849,7 @@ static DWORD WINAPI d3d8_texture_3d_SetLOD(IDirect3DVolumeTexture8 *iface, DWORD
...
@@ -849,7 +849,7 @@ static DWORD WINAPI d3d8_texture_3d_SetLOD(IDirect3DVolumeTexture8 *iface, DWORD
struct
d3d8_texture
*
texture
=
impl_from_IDirect3DVolumeTexture8
(
iface
);
struct
d3d8_texture
*
texture
=
impl_from_IDirect3DVolumeTexture8
(
iface
);
DWORD
ret
;
DWORD
ret
;
TRACE
(
"iface %p, lod %u.
\n
"
,
iface
,
lod
);
TRACE
(
"iface %p, lod %
l
u.
\n
"
,
iface
,
lod
);
wined3d_mutex_lock
();
wined3d_mutex_lock
();
ret
=
wined3d_texture_set_lod
(
d3d8_texture_get_draw_texture
(
texture
),
lod
);
ret
=
wined3d_texture_set_lod
(
d3d8_texture_get_draw_texture
(
texture
),
lod
);
...
@@ -940,7 +940,7 @@ static HRESULT WINAPI d3d8_texture_3d_LockBox(IDirect3DVolumeTexture8 *iface,
...
@@ -940,7 +940,7 @@ static HRESULT WINAPI d3d8_texture_3d_LockBox(IDirect3DVolumeTexture8 *iface,
struct
d3d8_volume
*
volume_impl
;
struct
d3d8_volume
*
volume_impl
;
HRESULT
hr
;
HRESULT
hr
;
TRACE
(
"iface %p, level %u, locked_box %p, box %p, flags %#x.
\n
"
,
TRACE
(
"iface %p, level %u, locked_box %p, box %p, flags %#
l
x.
\n
"
,
iface
,
level
,
locked_box
,
box
,
flags
);
iface
,
level
,
locked_box
,
box
,
flags
);
wined3d_mutex_lock
();
wined3d_mutex_lock
();
...
@@ -1076,7 +1076,7 @@ static HRESULT d3d8_texture_init(struct d3d8_texture *texture, struct d3d8_devic
...
@@ -1076,7 +1076,7 @@ static HRESULT d3d8_texture_init(struct d3d8_texture *texture, struct d3d8_devic
NULL
,
texture
,
&
d3d8_null_wined3d_parent_ops
,
&
texture
->
wined3d_texture
)))
NULL
,
texture
,
&
d3d8_null_wined3d_parent_ops
,
&
texture
->
wined3d_texture
)))
{
{
wined3d_mutex_unlock
();
wined3d_mutex_unlock
();
WARN
(
"Failed to create sysmem texture, hr %#x.
\n
"
,
hr
);
WARN
(
"Failed to create sysmem texture, hr %#
l
x.
\n
"
,
hr
);
return
hr
;
return
hr
;
}
}
...
@@ -1087,7 +1087,7 @@ static HRESULT d3d8_texture_init(struct d3d8_texture *texture, struct d3d8_devic
...
@@ -1087,7 +1087,7 @@ static HRESULT d3d8_texture_init(struct d3d8_texture *texture, struct d3d8_devic
{
{
wined3d_texture_decref
(
texture
->
wined3d_texture
);
wined3d_texture_decref
(
texture
->
wined3d_texture
);
wined3d_mutex_unlock
();
wined3d_mutex_unlock
();
WARN
(
"Failed to create draw texture, hr %#x.
\n
"
,
hr
);
WARN
(
"Failed to create draw texture, hr %#
l
x.
\n
"
,
hr
);
return
hr
;
return
hr
;
}
}
}
}
...
@@ -1097,7 +1097,7 @@ static HRESULT d3d8_texture_init(struct d3d8_texture *texture, struct d3d8_devic
...
@@ -1097,7 +1097,7 @@ static HRESULT d3d8_texture_init(struct d3d8_texture *texture, struct d3d8_devic
NULL
,
texture
,
&
d3d8_texture_wined3d_parent_ops
,
&
texture
->
wined3d_texture
)))
NULL
,
texture
,
&
d3d8_texture_wined3d_parent_ops
,
&
texture
->
wined3d_texture
)))
{
{
wined3d_mutex_unlock
();
wined3d_mutex_unlock
();
WARN
(
"Failed to create wined3d texture, hr %#x.
\n
"
,
hr
);
WARN
(
"Failed to create wined3d texture, hr %#
l
x.
\n
"
,
hr
);
return
hr
;
return
hr
;
}
}
}
}
...
...
dlls/d3d8/vertexdeclaration.c
View file @
52c35814
...
@@ -76,26 +76,26 @@ size_t parse_token(const DWORD* pToken)
...
@@ -76,26 +76,26 @@ size_t parse_token(const DWORD* pToken)
switch
((
token
&
D3DVSD_TOKENTYPEMASK
)
>>
D3DVSD_TOKENTYPESHIFT
)
{
/* maybe a macro to inverse ... */
switch
((
token
&
D3DVSD_TOKENTYPEMASK
)
>>
D3DVSD_TOKENTYPESHIFT
)
{
/* maybe a macro to inverse ... */
case
D3DVSD_TOKEN_NOP
:
case
D3DVSD_TOKEN_NOP
:
TRACE
(
" 0x%08x NOP()
\n
"
,
token
);
TRACE
(
" 0x%08
l
x NOP()
\n
"
,
token
);
break
;
break
;
case
D3DVSD_TOKEN_STREAM
:
case
D3DVSD_TOKEN_STREAM
:
if
(
token
&
D3DVSD_STREAMTESSMASK
)
if
(
token
&
D3DVSD_STREAMTESSMASK
)
{
{
TRACE
(
" 0x%08x STREAM_TESS()
\n
"
,
token
);
TRACE
(
" 0x%08
l
x STREAM_TESS()
\n
"
,
token
);
}
else
{
}
else
{
TRACE
(
" 0x%08
x STREAM(%
u)
\n
"
,
token
,
((
token
&
D3DVSD_STREAMNUMBERMASK
)
>>
D3DVSD_STREAMNUMBERSHIFT
));
TRACE
(
" 0x%08
lx STREAM(%l
u)
\n
"
,
token
,
((
token
&
D3DVSD_STREAMNUMBERMASK
)
>>
D3DVSD_STREAMNUMBERSHIFT
));
}
}
break
;
break
;
case
D3DVSD_TOKEN_STREAMDATA
:
case
D3DVSD_TOKEN_STREAMDATA
:
if
(
token
&
0x10000000
)
if
(
token
&
0x10000000
)
{
{
TRACE
(
" 0x%08
x SKIP(%
u)
\n
"
,
token
,
((
token
&
D3DVSD_SKIPCOUNTMASK
)
>>
D3DVSD_SKIPCOUNTSHIFT
));
TRACE
(
" 0x%08
lx SKIP(%l
u)
\n
"
,
token
,
((
token
&
D3DVSD_SKIPCOUNTMASK
)
>>
D3DVSD_SKIPCOUNTSHIFT
));
}
else
{
}
else
{
DWORD
type
=
((
token
&
D3DVSD_DATATYPEMASK
)
>>
D3DVSD_DATATYPESHIFT
);
DWORD
type
=
((
token
&
D3DVSD_DATATYPEMASK
)
>>
D3DVSD_DATATYPESHIFT
);
DWORD
reg
=
((
token
&
D3DVSD_VERTEXREGMASK
)
>>
D3DVSD_VERTEXREGSHIFT
);
DWORD
reg
=
((
token
&
D3DVSD_VERTEXREGMASK
)
>>
D3DVSD_VERTEXREGSHIFT
);
TRACE
(
" 0x%08x REG(%s, %s)
\n
"
,
token
,
debug_d3dvsde_register
(
reg
),
debug_d3dvsdt_type
(
type
));
TRACE
(
" 0x%08
l
x REG(%s, %s)
\n
"
,
token
,
debug_d3dvsde_register
(
reg
),
debug_d3dvsdt_type
(
type
));
}
}
break
;
break
;
...
@@ -104,12 +104,12 @@ size_t parse_token(const DWORD* pToken)
...
@@ -104,12 +104,12 @@ size_t parse_token(const DWORD* pToken)
{
{
DWORD
type
=
((
token
&
D3DVSD_DATATYPEMASK
)
>>
D3DVSD_DATATYPESHIFT
);
DWORD
type
=
((
token
&
D3DVSD_DATATYPEMASK
)
>>
D3DVSD_DATATYPESHIFT
);
DWORD
reg
=
((
token
&
D3DVSD_VERTEXREGMASK
)
>>
D3DVSD_VERTEXREGSHIFT
);
DWORD
reg
=
((
token
&
D3DVSD_VERTEXREGMASK
)
>>
D3DVSD_VERTEXREGSHIFT
);
TRACE
(
" 0x%08x TESSUV(%s) as %s
\n
"
,
token
,
debug_d3dvsde_register
(
reg
),
debug_d3dvsdt_type
(
type
));
TRACE
(
" 0x%08
l
x TESSUV(%s) as %s
\n
"
,
token
,
debug_d3dvsde_register
(
reg
),
debug_d3dvsdt_type
(
type
));
}
else
{
}
else
{
DWORD
type
=
((
token
&
D3DVSD_DATATYPEMASK
)
>>
D3DVSD_DATATYPESHIFT
);
DWORD
type
=
((
token
&
D3DVSD_DATATYPEMASK
)
>>
D3DVSD_DATATYPESHIFT
);
DWORD
regout
=
((
token
&
D3DVSD_VERTEXREGMASK
)
>>
D3DVSD_VERTEXREGSHIFT
);
DWORD
regout
=
((
token
&
D3DVSD_VERTEXREGMASK
)
>>
D3DVSD_VERTEXREGSHIFT
);
DWORD
regin
=
((
token
&
D3DVSD_VERTEXREGINMASK
)
>>
D3DVSD_VERTEXREGINSHIFT
);
DWORD
regin
=
((
token
&
D3DVSD_VERTEXREGINMASK
)
>>
D3DVSD_VERTEXREGINSHIFT
);
TRACE
(
" 0x%08x TESSNORMAL(%s, %s) as %s
\n
"
,
token
,
debug_d3dvsde_register
(
regin
),
TRACE
(
" 0x%08
l
x TESSNORMAL(%s, %s) as %s
\n
"
,
token
,
debug_d3dvsde_register
(
regin
),
debug_d3dvsde_register
(
regout
),
debug_d3dvsdt_type
(
type
));
debug_d3dvsde_register
(
regout
),
debug_d3dvsdt_type
(
type
));
}
}
break
;
break
;
...
@@ -125,18 +125,18 @@ size_t parse_token(const DWORD* pToken)
...
@@ -125,18 +125,18 @@ size_t parse_token(const DWORD* pToken)
{
{
DWORD
count
=
((
token
&
D3DVSD_CONSTCOUNTMASK
)
>>
D3DVSD_CONSTCOUNTSHIFT
);
DWORD
count
=
((
token
&
D3DVSD_CONSTCOUNTMASK
)
>>
D3DVSD_CONSTCOUNTSHIFT
);
DWORD
extinfo
=
((
token
&
D3DVSD_EXTINFOMASK
)
>>
D3DVSD_EXTINFOSHIFT
);
DWORD
extinfo
=
((
token
&
D3DVSD_EXTINFOMASK
)
>>
D3DVSD_EXTINFOSHIFT
);
TRACE
(
" 0x%08
x EXT(%u, %
u)
\n
"
,
token
,
count
,
extinfo
);
TRACE
(
" 0x%08
lx EXT(%lu, %l
u)
\n
"
,
token
,
count
,
extinfo
);
/* todo ... print extension */
/* todo ... print extension */
tokenlen
=
count
+
1
;
tokenlen
=
count
+
1
;
}
}
break
;
break
;
case
D3DVSD_TOKEN_END
:
case
D3DVSD_TOKEN_END
:
TRACE
(
" 0x%08x END()
\n
"
,
token
);
TRACE
(
" 0x%08
l
x END()
\n
"
,
token
);
break
;
break
;
default:
default:
TRACE
(
" 0x%08x UNKNOWN
\n
"
,
token
);
TRACE
(
" 0x%08
l
x UNKNOWN
\n
"
,
token
);
/* arg error */
/* arg error */
}
}
...
@@ -160,7 +160,7 @@ void load_local_constants(const DWORD *d3d8_elements, struct wined3d_shader *win
...
@@ -160,7 +160,7 @@ void load_local_constants(const DWORD *d3d8_elements, struct wined3d_shader *win
DWORD
i
;
DWORD
i
;
for
(
i
=
0
;
i
<
count
;
++
i
)
for
(
i
=
0
;
i
<
count
;
++
i
)
{
{
TRACE
(
"c[%u] = (%8f, %8f, %8f, %8f)
\n
"
,
TRACE
(
"c[%
l
u] = (%8f, %8f, %8f, %8f)
\n
"
,
constant_idx
,
constant_idx
,
*
(
const
float
*
)(
token
+
i
*
4
+
1
),
*
(
const
float
*
)(
token
+
i
*
4
+
1
),
*
(
const
float
*
)(
token
+
i
*
4
+
2
),
*
(
const
float
*
)(
token
+
i
*
4
+
2
),
...
@@ -291,7 +291,7 @@ static UINT convert_to_wined3d_declaration(const DWORD *d3d8_elements, DWORD *d3
...
@@ -291,7 +291,7 @@ static UINT convert_to_wined3d_declaration(const DWORD *d3d8_elements, DWORD *d3
offset
+=
wined3d_type_sizes
[
type
];
offset
+=
wined3d_type_sizes
[
type
];
}
else
if
(
token_type
==
D3DVSD_TOKEN_STREAMDATA
&&
(
*
token
&
D3DVSD_DATALOADTYPEMASK
))
{
}
else
if
(
token_type
==
D3DVSD_TOKEN_STREAMDATA
&&
(
*
token
&
D3DVSD_DATALOADTYPEMASK
))
{
TRACE
(
" 0x%08
x SKIP(%
u)
\n
"
,
*
token
,
(
*
token
&
D3DVSD_SKIPCOUNTMASK
)
>>
D3DVSD_SKIPCOUNTSHIFT
);
TRACE
(
" 0x%08
lx SKIP(%l
u)
\n
"
,
*
token
,
(
*
token
&
D3DVSD_SKIPCOUNTMASK
)
>>
D3DVSD_SKIPCOUNTSHIFT
);
offset
+=
sizeof
(
DWORD
)
*
((
*
token
&
D3DVSD_SKIPCOUNTMASK
)
>>
D3DVSD_SKIPCOUNTSHIFT
);
offset
+=
sizeof
(
DWORD
)
*
((
*
token
&
D3DVSD_SKIPCOUNTMASK
)
>>
D3DVSD_SKIPCOUNTSHIFT
);
}
}
...
@@ -354,7 +354,7 @@ HRESULT d3d8_vertex_declaration_init(struct d3d8_vertex_declaration *declaration
...
@@ -354,7 +354,7 @@ HRESULT d3d8_vertex_declaration_init(struct d3d8_vertex_declaration *declaration
heap_free
(
wined3d_elements
);
heap_free
(
wined3d_elements
);
if
(
FAILED
(
hr
))
if
(
FAILED
(
hr
))
{
{
WARN
(
"Failed to create wined3d vertex declaration, hr %#x.
\n
"
,
hr
);
WARN
(
"Failed to create wined3d vertex declaration, hr %#
l
x.
\n
"
,
hr
);
heap_free
(
declaration
->
elements
);
heap_free
(
declaration
->
elements
);
if
(
hr
==
E_INVALIDARG
)
if
(
hr
==
E_INVALIDARG
)
hr
=
E_FAIL
;
hr
=
E_FAIL
;
...
@@ -378,7 +378,7 @@ HRESULT d3d8_vertex_declaration_init_fvf(struct d3d8_vertex_declaration *declara
...
@@ -378,7 +378,7 @@ HRESULT d3d8_vertex_declaration_init_fvf(struct d3d8_vertex_declaration *declara
&
d3d8_vertexdeclaration_wined3d_parent_ops
,
&
declaration
->
wined3d_vertex_declaration
);
&
d3d8_vertexdeclaration_wined3d_parent_ops
,
&
declaration
->
wined3d_vertex_declaration
);
if
(
FAILED
(
hr
))
if
(
FAILED
(
hr
))
{
{
WARN
(
"Failed to create wined3d vertex declaration, hr %#x.
\n
"
,
hr
);
WARN
(
"Failed to create wined3d vertex declaration, hr %#
l
x.
\n
"
,
hr
);
if
(
hr
==
E_INVALIDARG
)
if
(
hr
==
E_INVALIDARG
)
hr
=
E_FAIL
;
hr
=
E_FAIL
;
return
hr
;
return
hr
;
...
...
dlls/d3d8/volume.c
View file @
52c35814
...
@@ -78,7 +78,7 @@ static HRESULT WINAPI d3d8_volume_SetPrivateData(IDirect3DVolume8 *iface, REFGUI
...
@@ -78,7 +78,7 @@ static HRESULT WINAPI d3d8_volume_SetPrivateData(IDirect3DVolume8 *iface, REFGUI
const
void
*
data
,
DWORD
data_size
,
DWORD
flags
)
const
void
*
data
,
DWORD
data_size
,
DWORD
flags
)
{
{
struct
d3d8_volume
*
volume
=
impl_from_IDirect3DVolume8
(
iface
);
struct
d3d8_volume
*
volume
=
impl_from_IDirect3DVolume8
(
iface
);
TRACE
(
"iface %p, guid %s, data %p, data_size %
u, flags %#
x.
\n
"
,
TRACE
(
"iface %p, guid %s, data %p, data_size %
lu, flags %#l
x.
\n
"
,
iface
,
debugstr_guid
(
guid
),
data
,
data_size
,
flags
);
iface
,
debugstr_guid
(
guid
),
data
,
data_size
,
flags
);
return
d3d8_resource_set_private_data
(
&
volume
->
resource
,
guid
,
data
,
data_size
,
flags
);
return
d3d8_resource_set_private_data
(
&
volume
->
resource
,
guid
,
data
,
data_size
,
flags
);
...
@@ -141,8 +141,7 @@ static HRESULT WINAPI d3d8_volume_LockBox(IDirect3DVolume8 *iface,
...
@@ -141,8 +141,7 @@ static HRESULT WINAPI d3d8_volume_LockBox(IDirect3DVolume8 *iface,
struct
wined3d_map_desc
map_desc
;
struct
wined3d_map_desc
map_desc
;
HRESULT
hr
;
HRESULT
hr
;
TRACE
(
"iface %p, locked_box %p, box %p, flags %#x.
\n
"
,
TRACE
(
"iface %p, locked_box %p, box %p, flags %#lx.
\n
"
,
iface
,
locked_box
,
box
,
flags
);
iface
,
locked_box
,
box
,
flags
);
if
(
FAILED
(
hr
=
wined3d_resource_map
(
wined3d_texture_get_resource
(
volume
->
wined3d_texture
),
if
(
FAILED
(
hr
=
wined3d_resource_map
(
wined3d_texture_get_resource
(
volume
->
wined3d_texture
),
volume
->
sub_resource_idx
,
&
map_desc
,
(
const
struct
wined3d_box
*
)
box
,
volume
->
sub_resource_idx
,
&
map_desc
,
(
const
struct
wined3d_box
*
)
box
,
...
...
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