summaryrefslogtreecommitdiffstats
path: root/src/gallium/state_trackers/nine/device9.c
diff options
context:
space:
mode:
authorAxel Davy <[email protected]>2016-10-28 19:19:39 +0200
committerAxel Davy <[email protected]>2016-12-20 23:44:22 +0100
commiteb884a4ac2579a8c15a0548e0a72cf9cc07530e0 (patch)
treea1c4feb107eeefa1d7c1f800d534830b084c4c01 /src/gallium/state_trackers/nine/device9.c
parentb95205b1f28ba23d88bc24bbb663b1e4938bbb48 (diff)
st/nine: Integrate nine_pipe_context_clear to nine_context_clear
Part of the refactor to move all gallium calls to nine_state.c, and have all internal states required for those calls in nine_context. Signed-off-by: Axel Davy <[email protected]>
Diffstat (limited to 'src/gallium/state_trackers/nine/device9.c')
-rw-r--r--src/gallium/state_trackers/nine/device9.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/gallium/state_trackers/nine/device9.c b/src/gallium/state_trackers/nine/device9.c
index 05fa71cec7c..c106ab12c8f 100644
--- a/src/gallium/state_trackers/nine/device9.c
+++ b/src/gallium/state_trackers/nine/device9.c
@@ -498,12 +498,10 @@ NineDevice9_dtor( struct NineDevice9 *This )
DBG("This=%p\n", This);
- if (This->context.pipe && This->context.cso)
- nine_pipe_context_clear(This);
nine_ff_fini(This);
nine_state_destroy_sw(This);
nine_state_clear(&This->state, TRUE);
- nine_context_clear(&This->context);
+ nine_context_clear(This);
if (This->vertex_uploader)
u_upload_destroy(This->vertex_uploader);
@@ -871,9 +869,8 @@ NineDevice9_Reset( struct NineDevice9 *This,
break;
}
- nine_pipe_context_clear(This);
nine_state_clear(&This->state, TRUE);
- nine_context_clear(&This->context);
+ nine_context_clear(This);
NineDevice9_SetDefaultState(This, TRUE);
NineDevice9_SetRenderTarget(