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
1f2a9e2c
Commit
1f2a9e2c
authored
Oct 29, 2005
by
Oliver Stieber
Committed by
Alexandre Julliard
Oct 29, 2005
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move the softwareVertexProcessing flag from the stateblock to the
device because its state shouldn't be recorded in a stateblock.
parent
e31f610b
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
device.c
dlls/wined3d/device.c
+2
-2
stateblock.c
dlls/wined3d/stateblock.c
+0
-2
wined3d_private.h
dlls/wined3d/wined3d_private.h
+4
-2
No files found.
dlls/wined3d/device.c
View file @
1f2a9e2c
...
@@ -5008,7 +5008,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetSoftwareVertexProcessing(IWineD3DDevice *
...
@@ -5008,7 +5008,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetSoftwareVertexProcessing(IWineD3DDevice *
showFixmes
=
FALSE
;
showFixmes
=
FALSE
;
}
}
This
->
updateStateBlock
->
softwareVertexProcessing
=
bSoftware
;
This
->
softwareVertexProcessing
=
bSoftware
;
return
D3D_OK
;
return
D3D_OK
;
}
}
...
@@ -5020,7 +5020,7 @@ BOOL WINAPI IWineD3DDeviceImpl_GetSoftwareVertexProcessing(IWineD3DDevice *
...
@@ -5020,7 +5020,7 @@ BOOL WINAPI IWineD3DDeviceImpl_GetSoftwareVertexProcessing(IWineD3DDevice *
FIXME
(
"(%p) : stub
\n
"
,
This
);
FIXME
(
"(%p) : stub
\n
"
,
This
);
showFixmes
=
FALSE
;
showFixmes
=
FALSE
;
}
}
return
This
->
updateStateBlock
->
softwareVertexProcessing
;
return
This
->
softwareVertexProcessing
;
}
}
...
...
dlls/wined3d/stateblock.c
View file @
1f2a9e2c
...
@@ -432,8 +432,6 @@ should really perform a delta so that only the changes get updated*/
...
@@ -432,8 +432,6 @@ should really perform a delta so that only the changes get updated*/
IWineD3DDevice_SetVertexDeclaration
(
pDevice
,
This
->
vertexDecl
);
IWineD3DDevice_SetVertexDeclaration
(
pDevice
,
This
->
vertexDecl
);
}
}
IWineD3DDevice_SetSoftwareVertexProcessing
(
pDevice
,
This
->
softwareVertexProcessing
);
/* Others + Render & Texture */
/* Others + Render & Texture */
if
(
/*TODO: 'magic' statetype, replace with BOOL This->blockType == D3DSBT_RECORDED || */
This
->
blockType
==
WINED3DSBT_ALL
||
This
->
blockType
==
WINED3DSBT_INIT
)
{
if
(
/*TODO: 'magic' statetype, replace with BOOL This->blockType == D3DSBT_RECORDED || */
This
->
blockType
==
WINED3DSBT_ALL
||
This
->
blockType
==
WINED3DSBT_INIT
)
{
for
(
i
=
1
;
i
<=
HIGHEST_TRANSFORMSTATE
;
i
++
)
{
for
(
i
=
1
;
i
<=
HIGHEST_TRANSFORMSTATE
;
i
++
)
{
...
...
dlls/wined3d/wined3d_private.h
View file @
1f2a9e2c
...
@@ -549,6 +549,10 @@ typedef struct IWineD3DDeviceImpl
...
@@ -549,6 +549,10 @@ typedef struct IWineD3DDeviceImpl
/* A flag to check if endscene has been called before changing the render tartet */
/* A flag to check if endscene has been called before changing the render tartet */
BOOL
sceneEnded
;
BOOL
sceneEnded
;
/* process vertex shaders using software or hardware */
BOOL
softwareVertexProcessing
;
}
IWineD3DDeviceImpl
;
}
IWineD3DDeviceImpl
;
extern
const
IWineD3DDeviceVtbl
IWineD3DDevice_Vtbl
;
extern
const
IWineD3DDeviceVtbl
IWineD3DDevice_Vtbl
;
...
@@ -912,8 +916,6 @@ struct IWineD3DStateBlockImpl
...
@@ -912,8 +916,6 @@ struct IWineD3DStateBlockImpl
float
vertexShaderConstantF
[
MAX_VSHADER_CONSTANTS
*
4
];
float
vertexShaderConstantF
[
MAX_VSHADER_CONSTANTS
*
4
];
WINESHADERCNST
vertexShaderConstantT
[
MAX_VSHADER_CONSTANTS
];
/* TODO: Think about changing this to a char to possibly save a little memory */
WINESHADERCNST
vertexShaderConstantT
[
MAX_VSHADER_CONSTANTS
];
/* TODO: Think about changing this to a char to possibly save a little memory */
BOOL
softwareVertexProcessing
;
/* Stream Source */
/* Stream Source */
BOOL
streamIsUP
;
BOOL
streamIsUP
;
UINT
streamStride
[
MAX_STREAMS
];
UINT
streamStride
[
MAX_STREAMS
];
...
...
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