projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
svga: Use utility functions to help determine whether we can use copy_region
[mesa.git]
/
src
/
gallium
/
drivers
/
svga
/
svga_pipe_vertex.c
diff --git
a/src/gallium/drivers/svga/svga_pipe_vertex.c
b/src/gallium/drivers/svga/svga_pipe_vertex.c
index b932c568f539d8be0811b2ad0d4de4975cb82943..9f67608d5282d69e90a08fc4611cedb9f3574cab 100644
(file)
--- a/
src/gallium/drivers/svga/svga_pipe_vertex.c
+++ b/
src/gallium/drivers/svga/svga_pipe_vertex.c
@@
-54,15
+54,6
@@
static void svga_set_vertex_buffers(struct pipe_context *pipe,
}
}
-static void svga_set_index_buffer(struct pipe_context *pipe,
- const struct pipe_index_buffer *ib)
-{
- struct svga_context *svga = svga_context(pipe);
-
- util_set_index_buffer(&svga->curr.ib, ib);
-}
-
-
/**
* Does the given vertex attrib format need range adjustment in the VS?
* Range adjustment scales and biases values from [0,1] to [-1,1].
/**
* Does the given vertex attrib format need range adjustment in the VS?
* Range adjustment scales and biases values from [0,1] to [-1,1].
@@
-275,7
+266,9
@@
svga_create_vertex_elements_state(struct pipe_context *pipe,
}
}
}
}
- svga->hud.num_state_objects++;
+ svga->hud.num_vertexelement_objects++;
+ SVGA_STATS_COUNT_INC(svga_screen(svga->pipe.screen)->sws,
+ SVGA_STATS_COUNT_VERTEXELEMENT);
return velems;
}
return velems;
}
@@
-318,7
+311,7
@@
svga_delete_vertex_elements_state(struct pipe_context *pipe, void *state)
}
FREE(velems);
}
FREE(velems);
- svga->hud.num_
state
_objects--;
+ svga->hud.num_
vertexelement
_objects--;
}
void svga_cleanup_vertex_state( struct svga_context *svga )
}
void svga_cleanup_vertex_state( struct svga_context *svga )
@@
-326,14
+319,18
@@
void svga_cleanup_vertex_state( struct svga_context *svga )
unsigned i;
for (i = 0 ; i < svga->curr.num_vertex_buffers; i++)
unsigned i;
for (i = 0 ; i < svga->curr.num_vertex_buffers; i++)
- pipe_resource_reference(&svga->curr.vb[i].buffer, NULL);
+ pipe_vertex_buffer_unreference(&svga->curr.vb[i]);
+
+ pipe_resource_reference(&svga->state.hw_draw.ib, NULL);
+
+ for (i = 0; i < svga->state.hw_draw.num_vbuffers; i++)
+ pipe_resource_reference(&svga->state.hw_draw.vbuffers[i], NULL);
}
void svga_init_vertex_functions( struct svga_context *svga )
{
svga->pipe.set_vertex_buffers = svga_set_vertex_buffers;
}
void svga_init_vertex_functions( struct svga_context *svga )
{
svga->pipe.set_vertex_buffers = svga_set_vertex_buffers;
- svga->pipe.set_index_buffer = svga_set_index_buffer;
svga->pipe.create_vertex_elements_state = svga_create_vertex_elements_state;
svga->pipe.bind_vertex_elements_state = svga_bind_vertex_elements_state;
svga->pipe.delete_vertex_elements_state = svga_delete_vertex_elements_state;
svga->pipe.create_vertex_elements_state = svga_create_vertex_elements_state;
svga->pipe.bind_vertex_elements_state = svga_bind_vertex_elements_state;
svga->pipe.delete_vertex_elements_state = svga_delete_vertex_elements_state;