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
cb472a3b
Commit
cb472a3b
authored
Oct 09, 2008
by
Henri Verbeet
Committed by
Alexandre Julliard
Oct 10, 2008
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Declare diffuseColor and specularColor inside their respective blocks (LLVM/Clang).
parent
f2dbaeff
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
8 deletions
+2
-8
drawprim.c
dlls/wined3d/drawprim.c
+2
-8
No files found.
dlls/wined3d/drawprim.c
View file @
cb472a3b
...
...
@@ -294,8 +294,6 @@ static void drawStridedSlow(IWineD3DDevice *iface, WineDirect3DVertexStridedData
const
WORD
*
pIdxBufS
=
NULL
;
const
DWORD
*
pIdxBufL
=
NULL
;
LONG
vx_index
;
DWORD
diffuseColor
=
0xFFFFFFFF
;
/* Diffuse Color */
DWORD
specularColor
=
0
;
/* Specular Color */
IWineD3DDeviceImpl
*
This
=
(
IWineD3DDeviceImpl
*
)
iface
;
UINT
*
streamOffset
=
This
->
stateBlock
->
streamOffset
;
long
SkipnStrides
=
startVertex
+
This
->
stateBlock
->
loadBaseVertexIndex
;
...
...
@@ -382,10 +380,6 @@ static void drawStridedSlow(IWineD3DDevice *iface, WineDirect3DVertexStridedData
/* For each primitive */
for
(
vx_index
=
0
;
vx_index
<
NumVertexes
;
++
vx_index
)
{
/* Initialize diffuse color */
diffuseColor
=
0xFFFFFFFF
;
/* Blending data and Point sizes are not supported by this function. They are not supported by the fixed
* function pipeline at all. A Fixme for them is printed after decoding the vertex declaration
*/
...
...
@@ -451,10 +445,10 @@ static void drawStridedSlow(IWineD3DDevice *iface, WineDirect3DVertexStridedData
diffuse_funcs
[
sd
->
u
.
s
.
diffuse
.
dwType
]((
void
*
)
ptrToCoords
);
if
(
This
->
activeContext
->
num_untracked_materials
)
{
DWORD
diffuseColor
=
ptrToCoords
[
0
];
unsigned
char
i
;
float
color
[
4
];
diffuseColor
=
ptrToCoords
[
0
];
color
[
0
]
=
D3DCOLOR_B_R
(
diffuseColor
)
/
255
.
0
;
color
[
1
]
=
D3DCOLOR_B_G
(
diffuseColor
)
/
255
.
0
;
color
[
2
]
=
D3DCOLOR_B_B
(
diffuseColor
)
/
255
.
0
;
...
...
@@ -475,7 +469,7 @@ static void drawStridedSlow(IWineD3DDevice *iface, WineDirect3DVertexStridedData
(
This
->
stateBlock
->
renderState
[
WINED3DRS_FOGVERTEXMODE
]
==
WINED3DFOG_NONE
||
sd
->
u
.
s
.
position
.
dwType
==
WINED3DDECLTYPE_FLOAT4
)
&&
This
->
stateBlock
->
renderState
[
WINED3DRS_FOGTABLEMODE
]
==
WINED3DFOG_NONE
)
{
if
(
GL_SUPPORT
(
EXT_FOG_COORD
))
{
specularColor
=
ptrToCoords
[
0
];
DWORD
specularColor
=
ptrToCoords
[
0
];
GL_EXTCALL
(
glFogCoordfEXT
(
specularColor
>>
24
));
}
else
{
static
BOOL
warned
=
FALSE
;
...
...
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