Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-fonts
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
Aleksandr Isakov
wine-fonts
Commits
14399f61
Commit
14399f61
authored
Aug 17, 2010
by
Henri Verbeet
Committed by
Alexandre Julliard
Aug 18, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ddraw: Remove a useless material callback.
parent
06a44abc
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
2 additions
and
5 deletions
+2
-5
ddraw.c
dlls/ddraw/ddraw.c
+0
-1
ddraw_private.h
dlls/ddraw/ddraw_private.h
+0
-2
device.c
dlls/ddraw/device.c
+1
-1
executebuffer.c
dlls/ddraw/executebuffer.c
+1
-1
No files found.
dlls/ddraw/ddraw.c
View file @
14399f61
...
...
@@ -4457,7 +4457,6 @@ static HRESULT WINAPI d3d3_CreateMaterial(IDirect3D3 *iface, IDirect3DMaterial3
object
->
IDirect3DMaterial_vtbl
=
&
IDirect3DMaterial_Vtbl
;
object
->
ref
=
1
;
object
->
ddraw
=
ddraw_from_d3d3
(
iface
);
object
->
activate
=
material_activate
;
TRACE
(
"Created material %p.
\n
"
,
object
);
*
material
=
(
IDirect3DMaterial3
*
)
object
;
...
...
dlls/ddraw/ddraw_private.h
View file @
14399f61
...
...
@@ -550,8 +550,6 @@ struct IDirect3DMaterialImpl
D3DMATERIAL
mat
;
DWORD
Handle
;
void
(
*
activate
)(
IDirect3DMaterialImpl
*
this
);
};
/* VTables in various versions */
...
...
dlls/ddraw/device.c
View file @
14399f61
...
...
@@ -3044,7 +3044,7 @@ IDirect3DDeviceImpl_3_SetLightState(IDirect3DDevice3 *iface,
}
TRACE
(
" activating material %p.
\n
"
,
m
);
m
->
activate
(
m
);
m
aterial_
activate
(
m
);
This
->
material
=
Value
;
}
...
...
dlls/ddraw/executebuffer.c
View file @
14399f61
...
...
@@ -261,7 +261,7 @@ IDirect3DExecuteBufferImpl_Execute(IDirect3DExecuteBufferImpl *This,
if
(
!
m
)
ERR
(
"Invalid material handle %#x.
\n
"
,
ci
->
u2
.
dwArg
[
0
]);
else
m
->
activate
(
m
);
m
aterial_
activate
(
m
);
}
else
if
(
ci
->
u1
.
dlstLightStateType
==
D3DLIGHTSTATE_COLORMODEL
/* 3 */
)
{
...
...
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