diff options
| author | Keith Whitwell <keithw@vmware.com> | 2010-03-10 08:29:27 +0000 |
|---|---|---|
| committer | Keith Whitwell <keithw@vmware.com> | 2010-03-10 08:29:27 +0000 |
| commit | 155fbcb0ed85c6452cbedd2317f201100fe698ab (patch) | |
| tree | 15e8a2662b1341bd07cebb9cd3624bc4ed42d020 /src/gallium/drivers/r300/r300_context.c | |
| parent | 9a8342ebcd83a2022b3c9b9539c5b15ac56d6440 (diff) | |
| parent | eeaa0861bfc98a06ceec269801271b7453c4fcbd (diff) | |
Merge commit 'origin/master' into gallium-sw-api-2
Diffstat (limited to 'src/gallium/drivers/r300/r300_context.c')
| -rw-r--r-- | src/gallium/drivers/r300/r300_context.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/gallium/drivers/r300/r300_context.c b/src/gallium/drivers/r300/r300_context.c index e0a5532327..923e1e541f 100644 --- a/src/gallium/drivers/r300/r300_context.c +++ b/src/gallium/drivers/r300/r300_context.c @@ -60,7 +60,6 @@ static void r300_destroy_context(struct pipe_context* context) FREE(r300->rs_block_state.state); FREE(r300->scissor_state.state); FREE(r300->textures_state.state); - FREE(r300->vertex_stream_state.state); FREE(r300->vap_output_state.state); FREE(r300->viewport_state.state); FREE(r300->ztop_state.state); @@ -147,7 +146,6 @@ static void r300_setup_atoms(struct r300_context* r300) r300->rs_block_state.state = CALLOC_STRUCT(r300_rs_block); r300->scissor_state.state = CALLOC_STRUCT(pipe_scissor_state); r300->textures_state.state = CALLOC_STRUCT(r300_textures_state); - r300->vertex_stream_state.state = CALLOC_STRUCT(r300_vertex_stream_state); r300->vap_output_state.state = CALLOC_STRUCT(r300_vap_output_state); r300->viewport_state.state = CALLOC_STRUCT(r300_viewport_state); r300->ztop_state.state = CALLOC_STRUCT(r300_ztop_state); |