Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-fonts
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
Aleksandr Isakov
wine-fonts
Commits
49f712be
Commit
49f712be
authored
Sep 29, 2009
by
Henri Verbeet
Committed by
Alexandre Julliard
Sep 29, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Explicitly pass gl_info to stateblock_savedstates_copy().
parent
6d3e5a9c
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
8 deletions
+8
-8
stateblock.c
dlls/wined3d/stateblock.c
+8
-8
No files found.
dlls/wined3d/stateblock.c
View file @
49f712be
...
...
@@ -71,12 +71,10 @@ fail:
return
E_OUTOFMEMORY
;
}
/** Copy all members of one stateblock to another */
static
void
stateblock_savedstates_copy
(
IWineD3DStateBlock
*
iface
,
SAVEDSTATES
*
dest
,
const
SAVEDSTATES
*
source
)
/* Copy all members of one stateblock to another */
static
void
stateblock_savedstates_copy
(
SAVEDSTATES
*
dest
,
const
SAVEDSTATES
*
source
,
const
struct
wined3d_gl_info
*
gl_info
)
{
IWineD3DStateBlockImpl
*
This
=
(
IWineD3DStateBlockImpl
*
)
iface
;
unsigned
bsize
=
sizeof
(
BOOL
);
/* Single values */
dest
->
primitive_type
=
source
->
primitive_type
;
dest
->
indices
=
source
->
indices
;
...
...
@@ -102,8 +100,10 @@ static void stateblock_savedstates_copy(IWineD3DStateBlock* iface, SAVEDSTATES *
dest
->
vertexShaderConstantsI
=
source
->
vertexShaderConstantsI
;
/* Dynamically sized arrays */
memcpy
(
dest
->
pixelShaderConstantsF
,
source
->
pixelShaderConstantsF
,
bsize
*
GL_LIMITS
(
pshader_constantsF
));
memcpy
(
dest
->
vertexShaderConstantsF
,
source
->
vertexShaderConstantsF
,
bsize
*
GL_LIMITS
(
vshader_constantsF
));
memcpy
(
dest
->
pixelShaderConstantsF
,
source
->
pixelShaderConstantsF
,
sizeof
(
BOOL
)
*
gl_info
->
max_pshader_constantsF
);
memcpy
(
dest
->
vertexShaderConstantsF
,
source
->
vertexShaderConstantsF
,
sizeof
(
BOOL
)
*
gl_info
->
max_vshader_constantsF
);
}
static
inline
void
stateblock_set_bits
(
DWORD
*
map
,
UINT
map_size
)
...
...
@@ -179,7 +179,7 @@ static void stateblock_copy(IWineD3DStateBlockImpl *dst, IWineD3DStateBlockImpl
dst
->
blockType
=
src
->
blockType
;
/* Saved states */
stateblock_savedstates_copy
(
(
IWineD3DStateBlock
*
)
src
,
&
dst
->
changed
,
&
src
->
changed
);
stateblock_savedstates_copy
(
&
dst
->
changed
,
&
src
->
changed
,
gl_info
);
/* Single items */
dst
->
gl_primitive_type
=
src
->
gl_primitive_type
;
...
...
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