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
6476ef59
Commit
6476ef59
authored
Nov 29, 2010
by
Henri Verbeet
Committed by
Alexandre Julliard
Nov 30, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Pass an IWineD3DDeviceImpl pointer to drawStridedSlow().
parent
8c241694
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
6 deletions
+5
-6
drawprim.c
dlls/wined3d/drawprim.c
+5
-6
No files found.
dlls/wined3d/drawprim.c
View file @
6476ef59
...
@@ -55,7 +55,7 @@ static void drawStridedFast(GLenum primitive_type, UINT count, UINT idx_size, co
...
@@ -55,7 +55,7 @@ static void drawStridedFast(GLenum primitive_type, UINT count, UINT idx_size, co
*/
*/
/* GL locking is done by the caller */
/* GL locking is done by the caller */
static
void
drawStridedSlow
(
IWineD3DDevice
*
ifa
ce
,
const
struct
wined3d_context
*
context
,
static
void
drawStridedSlow
(
IWineD3DDevice
Impl
*
devi
ce
,
const
struct
wined3d_context
*
context
,
const
struct
wined3d_stream_info
*
si
,
UINT
NumVertexes
,
GLenum
glPrimType
,
const
struct
wined3d_stream_info
*
si
,
UINT
NumVertexes
,
GLenum
glPrimType
,
const
void
*
idxData
,
UINT
idxSize
,
UINT
startIdx
)
const
void
*
idxData
,
UINT
idxSize
,
UINT
startIdx
)
{
{
...
@@ -63,8 +63,7 @@ static void drawStridedSlow(IWineD3DDevice *iface, const struct wined3d_context
...
@@ -63,8 +63,7 @@ static void drawStridedSlow(IWineD3DDevice *iface, const struct wined3d_context
const
WORD
*
pIdxBufS
=
NULL
;
const
WORD
*
pIdxBufS
=
NULL
;
const
DWORD
*
pIdxBufL
=
NULL
;
const
DWORD
*
pIdxBufL
=
NULL
;
UINT
vx_index
;
UINT
vx_index
;
IWineD3DDeviceImpl
*
This
=
(
IWineD3DDeviceImpl
*
)
iface
;
const
struct
wined3d_state
*
state
=
&
device
->
stateBlock
->
state
;
const
struct
wined3d_state
*
state
=
&
This
->
stateBlock
->
state
;
const
struct
wined3d_stream_state
*
streams
=
state
->
streams
;
const
struct
wined3d_stream_state
*
streams
=
state
->
streams
;
LONG
SkipnStrides
=
startIdx
+
state
->
load_base_vertex_index
;
LONG
SkipnStrides
=
startIdx
+
state
->
load_base_vertex_index
;
BOOL
pixelShader
=
use_ps
(
state
);
BOOL
pixelShader
=
use_ps
(
state
);
...
@@ -166,7 +165,7 @@ static void drawStridedSlow(IWineD3DDevice *iface, const struct wined3d_context
...
@@ -166,7 +165,7 @@ static void drawStridedSlow(IWineD3DDevice *iface, const struct wined3d_context
for
(
textureNo
=
0
;
textureNo
<
texture_stages
;
++
textureNo
)
for
(
textureNo
=
0
;
textureNo
<
texture_stages
;
++
textureNo
)
{
{
int
coordIdx
=
state
->
texture_states
[
textureNo
][
WINED3DTSS_TEXCOORDINDEX
];
int
coordIdx
=
state
->
texture_states
[
textureNo
][
WINED3DTSS_TEXCOORDINDEX
];
DWORD
texture_idx
=
This
->
texUnitMap
[
textureNo
];
DWORD
texture_idx
=
device
->
texUnitMap
[
textureNo
];
if
(
!
gl_info
->
supported
[
ARB_MULTITEXTURE
]
&&
textureNo
>
0
)
if
(
!
gl_info
->
supported
[
ARB_MULTITEXTURE
]
&&
textureNo
>
0
)
{
{
...
@@ -238,7 +237,7 @@ static void drawStridedSlow(IWineD3DDevice *iface, const struct wined3d_context
...
@@ -238,7 +237,7 @@ static void drawStridedSlow(IWineD3DDevice *iface, const struct wined3d_context
coord_idx
=
state
->
texture_states
[
texture
][
WINED3DTSS_TEXCOORDINDEX
];
coord_idx
=
state
->
texture_states
[
texture
][
WINED3DTSS_TEXCOORDINDEX
];
ptr
=
texCoords
[
coord_idx
]
+
(
SkipnStrides
*
si
->
elements
[
WINED3D_FFP_TEXCOORD0
+
coord_idx
].
stride
);
ptr
=
texCoords
[
coord_idx
]
+
(
SkipnStrides
*
si
->
elements
[
WINED3D_FFP_TEXCOORD0
+
coord_idx
].
stride
);
texture_idx
=
This
->
texUnitMap
[
texture
];
texture_idx
=
device
->
texUnitMap
[
texture
];
multi_texcoord_funcs
[
si
->
elements
[
WINED3D_FFP_TEXCOORD0
+
coord_idx
].
format
->
emit_idx
](
multi_texcoord_funcs
[
si
->
elements
[
WINED3D_FFP_TEXCOORD0
+
coord_idx
].
format
->
emit_idx
](
GL_TEXTURE0_ARB
+
texture_idx
,
ptr
);
GL_TEXTURE0_ARB
+
texture_idx
,
ptr
);
}
}
...
@@ -704,7 +703,7 @@ void drawPrimitive(IWineD3DDevice *iface, UINT index_count, UINT StartIdx, UINT
...
@@ -704,7 +703,7 @@ void drawPrimitive(IWineD3DDevice *iface, UINT index_count, UINT StartIdx, UINT
}
}
else
else
{
{
drawStridedSlow
(
iface
,
context
,
stream_info
,
index_count
,
drawStridedSlow
(
This
,
context
,
stream_info
,
index_count
,
glPrimType
,
idxData
,
idxSize
,
StartIdx
);
glPrimType
,
idxData
,
idxSize
,
StartIdx
);
}
}
}
}
...
...
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