Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Alexey Alyaev
wine
Commits
c60bdca5
Commit
c60bdca5
authored
17 years ago
by
Henri Verbeet
Committed by
Alexandre Julliard
17 years ago
Browse files
Options
Downloads
Patches
Plain Diff
wined3d: Make use of the texUnitMap in drawStridedSlow as well.
parent
2e786e09
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dlls/wined3d/drawprim.c
+5
-8
5 additions, 8 deletions
dlls/wined3d/drawprim.c
with
5 additions
and
8 deletions
dlls/wined3d/drawprim.c
+
5
−
8
View file @
c60bdca5
...
...
@@ -284,7 +284,6 @@ static void drawStridedSlow(IWineD3DDevice *iface, WineDirect3DVertexStridedData
const
void
*
idxData
,
short
idxSize
,
ULONG
minIndex
,
ULONG
startIdx
,
ULONG
startVertex
)
{
unsigned
int
textureNo
=
0
;
unsigned
int
texture_idx
=
0
;
const
WORD
*
pIdxBufS
=
NULL
;
const
DWORD
*
pIdxBufL
=
NULL
;
LONG
vx_index
;
...
...
@@ -318,7 +317,7 @@ static void drawStridedSlow(IWineD3DDevice *iface, WineDirect3DVertexStridedData
/* Adding the stream offset once is cheaper than doing it every iteration. Do not modify the strided data, it is a pointer
* to the strided Data in the device and might be needed intact on the next draw
*/
for
(
textureNo
=
0
,
texture_idx
=
0
;
textureNo
<
GL_LIMITS
(
texture_stages
);
++
textureNo
)
{
for
(
textureNo
=
0
;
textureNo
<
GL_LIMITS
(
texture_stages
);
++
textureNo
)
{
if
(
sd
->
u
.
s
.
texCoords
[
textureNo
].
lpData
)
{
texCoords
[
textureNo
]
=
sd
->
u
.
s
.
texCoords
[
textureNo
].
lpData
+
streamOffset
[
sd
->
u
.
s
.
texCoords
[
textureNo
].
streamNo
];
}
else
{
...
...
@@ -383,7 +382,7 @@ static void drawStridedSlow(IWineD3DDevice *iface, WineDirect3DVertexStridedData
}
/* Texture coords --------------------------- */
for
(
textureNo
=
0
,
texture_idx
=
0
;
textureNo
<
GL_LIMITS
(
texture_stages
);
++
textureNo
)
{
for
(
textureNo
=
0
;
textureNo
<
GL_LIMITS
(
texture_stages
);
++
textureNo
)
{
if
(
!
GL_SUPPORT
(
ARB_MULTITEXTURE
)
&&
textureNo
>
0
)
{
FIXME
(
"Program using multiple concurrent textures which this opengl implementation doesn't support
\n
"
);
...
...
@@ -399,23 +398,22 @@ static void drawStridedSlow(IWineD3DDevice *iface, WineDirect3DVertexStridedData
if
(
coordIdx
>
7
)
{
VTRACE
((
"tex: %d - Skip tex coords, as being system generated
\n
"
,
textureNo
));
++
texture_idx
;
continue
;
}
else
if
(
coordIdx
<
0
)
{
FIXME
(
"tex: %d - Coord index %d is less than zero, expect a crash.
\n
"
,
textureNo
,
coordIdx
);
++
texture_idx
;
continue
;
}
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
);
++
texture_idx
;
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
;
/* The coords to supply depend completely on the fvf / vertex shader */
switch
(
coordsToUse
)
{
case
4
:
q
=
ptrToCoords
[
3
];
/* drop through */
...
...
@@ -492,7 +490,6 @@ static void drawStridedSlow(IWineD3DDevice *iface, WineDirect3DVertexStridedData
}
}
}
if
(
/*!GL_SUPPORT(NV_REGISTER_COMBINERS) || This->stateBlock->textures[textureNo]*/
TRUE
)
++
texture_idx
;
}
/* End of textures */
/* Diffuse -------------------------------- */
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment