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
282696b4
Commit
282696b4
authored
Aug 29, 2007
by
Stefan Dösinger
Committed by
Alexandre Julliard
Aug 31, 2007
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Supply texture coords even if no texture is bound and pshaders are used.
parent
94074ad3
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
2 deletions
+7
-2
drawprim.c
dlls/wined3d/drawprim.c
+7
-2
No files found.
dlls/wined3d/drawprim.c
View file @
282696b4
...
...
@@ -301,6 +301,7 @@ static void drawStridedSlow(IWineD3DDevice *iface, WineDirect3DVertexStridedData
IWineD3DDeviceImpl
*
This
=
(
IWineD3DDeviceImpl
*
)
iface
;
UINT
*
streamOffset
=
This
->
stateBlock
->
streamOffset
;
long
SkipnStrides
=
startVertex
+
This
->
stateBlock
->
loadBaseVertexIndex
;
BOOL
pixelShader
=
use_ps
(
This
);
BYTE
*
texCoords
[
WINED3DDP_MAXTEXCOORD
];
BYTE
*
diffuse
=
NULL
,
*
specular
=
NULL
,
*
normal
=
NULL
,
*
position
=
NULL
;
...
...
@@ -397,9 +398,10 @@ static void drawStridedSlow(IWineD3DDevice *iface, WineDirect3DVertexStridedData
}
/* Query tex coords */
if
(
This
->
stateBlock
->
textures
[
textureNo
]
!=
NULL
)
{
if
(
This
->
stateBlock
->
textures
[
textureNo
]
!=
NULL
||
pixelShader
)
{
int
coordIdx
=
This
->
stateBlock
->
textureState
[
textureNo
][
WINED3DTSS_TEXCOORDINDEX
];
int
texture_idx
=
This
->
texUnitMap
[
textureNo
];
float
*
ptrToCoords
=
NULL
;
float
s
=
0
.
0
,
t
=
0
.
0
,
r
=
0
.
0
,
q
=
0
.
0
;
...
...
@@ -414,10 +416,13 @@ static void drawStridedSlow(IWineD3DDevice *iface, WineDirect3DVertexStridedData
ptrToCoords
=
(
float
*
)(
texCoords
[
coordIdx
]
+
(
SkipnStrides
*
sd
->
u
.
s
.
texCoords
[
coordIdx
].
dwStride
));
if
(
texCoords
[
coordIdx
]
==
NULL
)
{
TRACE
(
"tex: %d - Skipping tex coords, as no data supplied
\n
"
,
textureNo
);
if
(
GL_SUPPORT
(
ARB_MULTITEXTURE
))
{
GL_EXTCALL
(
glMultiTexCoord4fARB
(
GL_TEXTURE0_ARB
+
texture_idx
,
0
,
0
,
0
,
1
));
}
else
{
glTexCoord4f
(
0
,
0
,
0
,
1
);
}
continue
;
}
else
{
int
texture_idx
=
This
->
texUnitMap
[
textureNo
];
int
coordsToUse
=
sd
->
u
.
s
.
texCoords
[
coordIdx
].
dwType
+
1
;
/* 0 == WINED3DDECLTYPE_FLOAT1 etc */
if
(
texture_idx
==
-
1
)
continue
;
...
...
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