[PATCH 1/5] wined3d: Don't clamp vertex depth values.
Henri Verbeet
hverbeet at codeweavers.com
Sun Jun 5 15:48:50 CDT 2011
Since we report D3DPMISCCAPS_CLIPTLVERTS.
---
dlls/d3d8/tests/visual.c | 10 +++++-----
dlls/d3d9/tests/visual.c | 10 +++++-----
dlls/ddraw/tests/visual.c | 10 +++++-----
dlls/wined3d/state.c | 19 +++----------------
4 files changed, 18 insertions(+), 31 deletions(-)
diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c
index 1e48c03..ae8276d 100644
--- a/dlls/d3d8/tests/visual.c
+++ b/dlls/d3d8/tests/visual.c
@@ -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
{
diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c
index e6cab39..3773ad7 100644
--- a/dlls/d3d9/tests/visual.c
+++ b/dlls/d3d9/tests/visual.c
@@ -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
{
diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c
index 5eec1c8..b6c8006 100644
--- a/dlls/ddraw/tests/visual.c
+++ b/dlls/ddraw/tests/visual.c
@@ -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;
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index a2c197b..6c6ae3a 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -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)"); }
--
1.7.3.4
More information about the wine-patches
mailing list