Module: wine Branch: master Commit: 565fcbdfb88971973a612e66408bfb2fdc031f8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=565fcbdfb88971973a612e6640...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Thu Jul 14 01:02:46 2011 +0200
wined3d: Get rid of the clip status code.
I'm pretty sure this is just broken, and I'm not aware of any application using this.
---
dlls/wined3d/device.c | 6 ------ dlls/wined3d/state.c | 12 ------------ dlls/wined3d/stateblock.c | 4 ---- dlls/wined3d/wined3d_private.h | 1 - 4 files changed, 0 insertions(+), 23 deletions(-)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b2dd89a..4f7ab3b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2242,9 +2242,6 @@ HRESULT CDECL wined3d_device_set_clip_status(struct wined3d_device *device, cons if (!clip_status) return WINED3DERR_INVALIDCALL;
- device->updateStateBlock->state.clip_status.ClipUnion = clip_status->ClipUnion; - device->updateStateBlock->state.clip_status.ClipIntersection = clip_status->ClipIntersection; - return WINED3D_OK; }
@@ -2255,9 +2252,6 @@ HRESULT CDECL wined3d_device_get_clip_status(struct wined3d_device *device, WINE if (!clip_status) return WINED3DERR_INVALIDCALL;
- clip_status->ClipUnion = device->updateStateBlock->state.clip_status.ClipUnion; - clip_status->ClipIntersection = device->updateStateBlock->state.clip_status.ClipIntersection; - return WINED3D_OK; }
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index ee521a4..42a7a31 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -573,18 +573,6 @@ static void state_clipping(DWORD state_id, struct wined3d_stateblock *stateblock if (disable & WINED3DCLIPPLANE3) { glDisable(GL_CLIP_PLANE3); checkGLcall("glDisable(clip plane 3)"); } if (disable & WINED3DCLIPPLANE4) { glDisable(GL_CLIP_PLANE4); checkGLcall("glDisable(clip plane 4)"); } if (disable & WINED3DCLIPPLANE5) { glDisable(GL_CLIP_PLANE5); checkGLcall("glDisable(clip plane 5)"); } - - /** update clipping status */ - if (enable) - { - stateblock->state.clip_status.ClipUnion = 0; - stateblock->state.clip_status.ClipIntersection = 0xFFFFFFFF; - } - else - { - stateblock->state.clip_status.ClipUnion = 0; - stateblock->state.clip_status.ClipIntersection = 0; - } }
static void state_blendop_w(DWORD state, struct wined3d_stateblock *stateblock, struct wined3d_context *context) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index a9baa0e..6764b23 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1233,10 +1233,6 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock) state->render_states[WINED3DRS_DESTBLENDALPHA] = WINED3DBLEND_ZERO; state->render_states[WINED3DRS_BLENDOPALPHA] = WINED3DBLENDOP_ADD;
- /* clipping status */ - state->clip_status.ClipUnion = 0; - state->clip_status.ClipIntersection = 0xFFFFFFFF; - /* Texture Stage States - Put directly into state block, we will call function below */ for (i = 0; i < MAX_TEXTURES; ++i) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index dc036fc..da01906 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2265,7 +2265,6 @@ struct wined3d_state
WINED3DMATRIX transforms[HIGHEST_TRANSFORMSTATE + 1]; double clip_planes[MAX_CLIPPLANES][4]; - WINED3DCLIPSTATUS clip_status; WINED3DMATERIAL material; WINED3DVIEWPORT viewport; RECT scissor_rect;