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
708d9421
Commit
708d9421
authored
Jun 05, 2011
by
Henri Verbeet
Committed by
Alexandre Julliard
Jun 06, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Don't clamp vertex depth values.
Since we report D3DPMISCCAPS_CLIPTLVERTS.
parent
7399177f
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
31 deletions
+18
-31
visual.c
dlls/d3d8/tests/visual.c
+5
-5
visual.c
dlls/d3d9/tests/visual.c
+5
-5
visual.c
dlls/ddraw/tests/visual.c
+5
-5
state.c
dlls/wined3d/state.c
+3
-16
No files found.
dlls/d3d8/tests/visual.c
View file @
708d9421
...
...
@@ -1416,15 +1416,15 @@ static void depth_clamp_test(IDirect3DDevice8 *device)
if
(
caps
.
PrimitiveMiscCaps
&
D3DPMISCCAPS_CLIPTLVERTS
)
{
color
=
getPixelColor
(
device
,
75
,
75
);
todo_wine
ok
(
color_match
(
color
,
0x0000ff00
,
1
),
"color 0x%08x.
\n
"
,
color
);
ok
(
color_match
(
color
,
0x0000ff00
,
1
),
"color 0x%08x.
\n
"
,
color
);
color
=
getPixelColor
(
device
,
150
,
150
);
todo_wine
ok
(
color_match
(
color
,
0x0000ff00
,
1
),
"color 0x%08x.
\n
"
,
color
);
ok
(
color_match
(
color
,
0x0000ff00
,
1
),
"color 0x%08x.
\n
"
,
color
);
color
=
getPixelColor
(
device
,
320
,
240
);
todo_wine
ok
(
color_match
(
color
,
0x0000ff00
,
1
),
"color 0x%08x.
\n
"
,
color
);
ok
(
color_match
(
color
,
0x0000ff00
,
1
),
"color 0x%08x.
\n
"
,
color
);
color
=
getPixelColor
(
device
,
320
,
330
);
todo_wine
ok
(
color_match
(
color
,
0x0000ff00
,
1
),
"color 0x%08x.
\n
"
,
color
);
ok
(
color_match
(
color
,
0x0000ff00
,
1
),
"color 0x%08x.
\n
"
,
color
);
color
=
getPixelColor
(
device
,
320
,
330
);
todo_wine
ok
(
color_match
(
color
,
0x0000ff00
,
1
),
"color 0x%08x.
\n
"
,
color
);
ok
(
color_match
(
color
,
0x0000ff00
,
1
),
"color 0x%08x.
\n
"
,
color
);
}
else
{
...
...
dlls/d3d9/tests/visual.c
View file @
708d9421
...
...
@@ -10613,15 +10613,15 @@ static void depth_clamp_test(IDirect3DDevice9 *device)
if
(
caps
.
PrimitiveMiscCaps
&
D3DPMISCCAPS_CLIPTLVERTS
)
{
color
=
getPixelColor
(
device
,
75
,
75
);
todo_wine
ok
(
color_match
(
color
,
0x0000ff00
,
1
),
"color 0x%08x.
\n
"
,
color
);
ok
(
color_match
(
color
,
0x0000ff00
,
1
),
"color 0x%08x.
\n
"
,
color
);
color
=
getPixelColor
(
device
,
150
,
150
);
todo_wine
ok
(
color_match
(
color
,
0x0000ff00
,
1
),
"color 0x%08x.
\n
"
,
color
);
ok
(
color_match
(
color
,
0x0000ff00
,
1
),
"color 0x%08x.
\n
"
,
color
);
color
=
getPixelColor
(
device
,
320
,
240
);
todo_wine
ok
(
color_match
(
color
,
0x0000ff00
,
1
),
"color 0x%08x.
\n
"
,
color
);
ok
(
color_match
(
color
,
0x0000ff00
,
1
),
"color 0x%08x.
\n
"
,
color
);
color
=
getPixelColor
(
device
,
320
,
330
);
todo_wine
ok
(
color_match
(
color
,
0x0000ff00
,
1
),
"color 0x%08x.
\n
"
,
color
);
ok
(
color_match
(
color
,
0x0000ff00
,
1
),
"color 0x%08x.
\n
"
,
color
);
color
=
getPixelColor
(
device
,
320
,
330
);
todo_wine
ok
(
color_match
(
color
,
0x0000ff00
,
1
),
"color 0x%08x.
\n
"
,
color
);
ok
(
color_match
(
color
,
0x0000ff00
,
1
),
"color 0x%08x.
\n
"
,
color
);
}
else
{
...
...
dlls/ddraw/tests/visual.c
View file @
708d9421
...
...
@@ -2901,15 +2901,15 @@ static void depth_clamp_test(IDirect3DDevice7 *device)
ok
(
SUCCEEDED
(
hr
),
"EndScene failed, hr %#x.
\n
"
,
hr
);
color
=
getPixelColor
(
device
,
75
,
75
);
todo_wine
ok
(
color_match
(
color
,
0x00ffffff
,
1
)
||
color_match
(
color
,
0x0000ff00
,
1
),
"color 0x%08x.
\n
"
,
color
);
ok
(
color_match
(
color
,
0x00ffffff
,
1
)
||
color_match
(
color
,
0x0000ff00
,
1
),
"color 0x%08x.
\n
"
,
color
);
color
=
getPixelColor
(
device
,
150
,
150
);
todo_wine
ok
(
color_match
(
color
,
0x00ffffff
,
1
)
||
color_match
(
color
,
0x0000ff00
,
1
),
"color 0x%08x.
\n
"
,
color
);
ok
(
color_match
(
color
,
0x00ffffff
,
1
)
||
color_match
(
color
,
0x0000ff00
,
1
),
"color 0x%08x.
\n
"
,
color
);
color
=
getPixelColor
(
device
,
320
,
240
);
todo_wine
ok
(
color_match
(
color
,
0x00002b7f
,
1
)
||
color_match
(
color
,
0x0000ff00
,
1
),
"color 0x%08x.
\n
"
,
color
);
ok
(
color_match
(
color
,
0x00002b7f
,
1
)
||
color_match
(
color
,
0x0000ff00
,
1
),
"color 0x%08x.
\n
"
,
color
);
color
=
getPixelColor
(
device
,
320
,
330
);
todo_wine
ok
(
color_match
(
color
,
0x00f9e814
,
1
)
||
color_match
(
color
,
0x0000ff00
,
1
),
"color 0x%08x.
\n
"
,
color
);
ok
(
color_match
(
color
,
0x00f9e814
,
1
)
||
color_match
(
color
,
0x0000ff00
,
1
),
"color 0x%08x.
\n
"
,
color
);
color
=
getPixelColor
(
device
,
320
,
330
);
todo_wine
ok
(
color_match
(
color
,
0x00f9e814
,
1
)
||
color_match
(
color
,
0x0000ff00
,
1
),
"color 0x%08x.
\n
"
,
color
);
ok
(
color_match
(
color
,
0x00f9e814
,
1
)
||
color_match
(
color
,
0x0000ff00
,
1
),
"color 0x%08x.
\n
"
,
color
);
vp
.
dvMinZ
=
0
.
0
;
vp
.
dvMaxZ
=
1
.
0
;
...
...
dlls/wined3d/state.c
View file @
708d9421
...
...
@@ -486,7 +486,6 @@ static void state_alpha(DWORD state, struct wined3d_stateblock *stateblock, stru
static
void
state_clipping
(
DWORD
state_id
,
struct
wined3d_stateblock
*
stateblock
,
struct
wined3d_context
*
context
)
{
const
struct
wined3d_gl_info
*
gl_info
=
context
->
gl_info
;
const
struct
wined3d_state
*
state
=
&
stateblock
->
state
;
DWORD
enable
=
0xFFFFFFFF
;
DWORD
disable
=
0x00000000
;
...
...
@@ -520,23 +519,11 @@ static void state_clipping(DWORD state_id, struct wined3d_stateblock *stateblock
{
enable
=
state
->
render_states
[
WINED3DRS_CLIPPLANEENABLE
];
disable
=
~
state
->
render_states
[
WINED3DRS_CLIPPLANEENABLE
];
if
(
gl_info
->
supported
[
ARB_DEPTH_CLAMP
])
{
glDisable
(
GL_DEPTH_CLAMP
);
checkGLcall
(
"glDisable(GL_DEPTH_CLAMP)"
);
}
}
else
{
}
else
{
disable
=
0xffffffff
;
enable
=
0x00
;
if
(
gl_info
->
supported
[
ARB_DEPTH_CLAMP
])
{
glEnable
(
GL_DEPTH_CLAMP
);
checkGLcall
(
"glEnable(GL_DEPTH_CLAMP)"
);
}
else
{
FIXME
(
"Clipping disabled, but ARB_depth_clamp isn't supported.
\n
"
);
}
}
if
(
enable
&
WINED3DCLIPPLANE0
)
{
glEnable
(
GL_CLIP_PLANE0
);
checkGLcall
(
"glEnable(clip plane 0)"
);
}
...
...
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