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
e28630bc
Commit
e28630bc
authored
Apr 20, 2007
by
Fabian Bieler
Committed by
Alexandre Julliard
Apr 23, 2007
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Remove usesFog flag from IWineD3DVertexShaderImpl.
parent
71fe9ae7
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
9 deletions
+4
-9
state.c
dlls/wined3d/state.c
+2
-2
vertexshader.c
dlls/wined3d/vertexshader.c
+2
-6
wined3d_private.h
dlls/wined3d/wined3d_private.h
+0
-1
No files found.
dlls/wined3d/state.c
View file @
e28630bc
...
...
@@ -765,7 +765,7 @@ static void state_fog(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCo
}
if
(
use_vs
(
stateblock
->
wineD3DDevice
)
&&
((
IWineD3DVertexShaderImpl
*
)
stateblock
->
vertexShader
)
->
usesF
og
)
{
&&
((
IWineD3DVertexShaderImpl
*
)
stateblock
->
vertexShader
)
->
baseShader
.
reg_maps
.
f
og
)
{
if
(
stateblock
->
renderState
[
WINED3DRS_FOGTABLEMODE
]
!=
WINED3DFOG_NONE
)
{
if
(
!
is_ps3
)
FIXME
(
"Implement table fog for foggy vertex shader
\n
"
);
/* Disable fog */
...
...
@@ -3018,7 +3018,7 @@ static void vertexdeclaration(DWORD state, IWineD3DStateBlockImpl *stateblock, W
((
IWineD3DVertexShaderImpl
*
)
stateblock
->
vertexShader
)
->
baseShader
.
function
!=
NULL
)
{
useVertexShaderFunction
=
TRUE
;
if
(((
IWineD3DVertexShaderImpl
*
)
stateblock
->
vertexShader
)
->
usesF
og
!=
context
->
last_was_foggy_shader
)
{
if
(((
IWineD3DVertexShaderImpl
*
)
stateblock
->
vertexShader
)
->
baseShader
.
reg_maps
.
f
og
!=
context
->
last_was_foggy_shader
)
{
updateFog
=
TRUE
;
}
}
else
if
(
context
->
last_was_foggy_shader
)
{
...
...
dlls/wined3d/vertexshader.c
View file @
e28630bc
...
...
@@ -337,9 +337,7 @@ static VOID IWineD3DVertexShaderImpl_GenerateShader(
vshader_glsl_output_unpack
(
&
buffer
,
This
->
semantics_out
);
/* If this shader doesn't use fog copy the z coord to the fog coord so that we can use table fog */
if
(
reg_maps
->
fog
)
This
->
usesFog
=
1
;
else
if
(
!
reg_maps
->
fog
)
shader_addline
(
&
buffer
,
"gl_FogFragCoord = gl_Position.z;
\n
"
);
/* Write the final position.
...
...
@@ -386,9 +384,7 @@ static VOID IWineD3DVertexShaderImpl_GenerateShader(
shader_generate_main
(
(
IWineD3DBaseShader
*
)
This
,
&
buffer
,
reg_maps
,
pFunction
);
/* If this shader doesn't use fog copy the z coord to the fog coord so that we can use table fog */
if
(
reg_maps
->
fog
)
This
->
usesFog
=
1
;
else
if
(
!
reg_maps
->
fog
)
shader_addline
(
&
buffer
,
"MOV result.fogcoord, TMP_OUT.z;
\n
"
);
/* Write the final position.
...
...
dlls/wined3d/wined3d_private.h
View file @
e28630bc
...
...
@@ -1892,7 +1892,6 @@ typedef struct IWineD3DVertexShaderImpl {
/* IWineD3DVertexShaderImpl */
IUnknown
*
parent
;
char
usesFog
;
DWORD
usage
;
/* Vertex shader input and output semantics */
...
...
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