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
c60f296b
Commit
c60f296b
authored
May 26, 2006
by
Jason Green
Committed by
Alexandre Julliard
May 26, 2006
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Fix regression introduced by recent multitexture patch.
parent
ac30d46b
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
drawprim.c
dlls/wined3d/drawprim.c
+4
-4
No files found.
dlls/wined3d/drawprim.c
View file @
c60f296b
...
...
@@ -1193,7 +1193,7 @@ static void loadVertexData(IWineD3DDevice *iface, WineDirect3DVertexStridedData
}
/* Select the correct texture stage */
GL_EXTCALL
(
glClientActiveTextureARB
(
textureNo
));
GL_EXTCALL
(
glClientActiveTextureARB
(
GL_TEXTURE0_ARB
+
textureNo
));
if
(
This
->
stateBlock
->
textures
[
textureNo
]
!=
NULL
)
{
int
coordIdx
=
This
->
stateBlock
->
textureState
[
textureNo
][
D3DTSS_TEXCOORDINDEX
];
TRACE
(
"Setting up texture %u, cordindx %u, data %p
\n
"
,
textureNo
,
coordIdx
,
sd
->
u
.
s
.
texCoords
[
coordIdx
].
lpData
);
...
...
@@ -1201,12 +1201,12 @@ static void loadVertexData(IWineD3DDevice *iface, WineDirect3DVertexStridedData
if
(
coordIdx
>=
MAX_TEXTURES
)
{
VTRACE
((
"tex: %d - Skip tex coords, as being system generated
\n
"
,
textureNo
));
glDisableClientState
(
GL_TEXTURE_COORD_ARRAY
);
GL_EXTCALL
(
glMultiTexCoord4fARB
(
textureNo
,
0
,
0
,
0
,
1
));
GL_EXTCALL
(
glMultiTexCoord4fARB
(
GL_TEXTURE0_ARB
+
textureNo
,
0
,
0
,
0
,
1
));
}
else
if
(
sd
->
u
.
s
.
texCoords
[
coordIdx
].
lpData
==
NULL
)
{
VTRACE
((
"Bound texture but no texture coordinates supplied, so skipping
\n
"
));
glDisableClientState
(
GL_TEXTURE_COORD_ARRAY
);
GL_EXTCALL
(
glMultiTexCoord4fARB
(
textureNo
,
0
,
0
,
0
,
1
));
GL_EXTCALL
(
glMultiTexCoord4fARB
(
GL_TEXTURE0_ARB
+
textureNo
,
0
,
0
,
0
,
1
));
}
else
{
...
...
@@ -1217,7 +1217,7 @@ static void loadVertexData(IWineD3DDevice *iface, WineDirect3DVertexStridedData
}
else
{
glDisableClientState
(
GL_TEXTURE_COORD_ARRAY
);
GL_EXTCALL
(
glMultiTexCoord4fARB
(
textureNo
,
0
,
0
,
0
,
1
));
GL_EXTCALL
(
glMultiTexCoord4fARB
(
GL_TEXTURE0_ARB
+
textureNo
,
0
,
0
,
0
,
1
));
}
}
}
...
...
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