fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 08:58:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

r300g/swtcl: don't do stuff which is only for HWTCL

Browse source
This commit is contained in:
Marek Olšák 2012-05-11 23:09:05 +02:00
parent f808984f43
commit 8a963d122d
2 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/gallium/drivers/r300/r300_context.c
View file

@ -80,7 +80,8 @@ static void r300_destroy_context(struct pipe_context* context)
if (r300->draw) if (r300->draw)
draw_destroy(r300->draw); draw_destroy(r300->draw);
u_upload_destroy(r300->uploader); if (r300->uploader)
u_upload_destroy(r300->uploader);
/* XXX: This function assumes r300->query_list was initialized */ /* XXX: This function assumes r300->query_list was initialized */
r300_release_referenced_objects(r300); r300_release_referenced_objects(r300);
@ -402,8 +403,10 @@ struct pipe_context* r300_create_context(struct pipe_screen* screen,
r300->context.create_video_decoder = vl_create_decoder; r300->context.create_video_decoder = vl_create_decoder;
r300->context.create_video_buffer = vl_video_buffer_create; r300->context.create_video_buffer = vl_video_buffer_create;
r300->uploader = u_upload_create(&r300->context, 256 * 1024, 4, if (r300screen->caps.has_tcl) {
PIPE_BIND_INDEX_BUFFER); r300->uploader = u_upload_create(&r300->context, 256 * 1024, 4,
PIPE_BIND_INDEX_BUFFER);
}
r300->blitter = util_blitter_create(&r300->context); r300->blitter = util_blitter_create(&r300->context);
if (r300->blitter == NULL) if (r300->blitter == NULL)
@ -437,7 +440,7 @@ struct pipe_context* r300_create_context(struct pipe_screen* screen,
pipe_resource_reference(&tex, NULL); pipe_resource_reference(&tex, NULL);
} }
{ if (r300screen->caps.has_tcl) {
struct pipe_resource vb; struct pipe_resource vb;
memset(&vb, 0, sizeof(vb)); memset(&vb, 0, sizeof(vb));
vb.target = PIPE_BUFFER; vb.target = PIPE_BUFFER;

23
src/gallium/drivers/r300/r300_state.c
View file

@ -1594,19 +1594,22 @@ static void r300_set_vertex_buffers(struct pipe_context* pipe,
{ {
struct r300_context* r300 = r300_context(pipe); struct r300_context* r300 = r300_context(pipe);
/* There must be at least one vertex buffer set, otherwise it locks up. */
if (!count) {
buffers = &r300->dummy_vb;
count = 1;
}
util_copy_vertex_buffers(r300->vertex_buffer,
&r300->nr_vertex_buffers,
buffers, count);
if (r300->screen->caps.has_tcl) { if (r300->screen->caps.has_tcl) {
/* There must be at least one vertex buffer set, otherwise it locks up. */
if (!count) {
buffers = &r300->dummy_vb;
count = 1;
}
util_copy_vertex_buffers(r300->vertex_buffer,
&r300->nr_vertex_buffers,
buffers, count);
r300->vertex_arrays_dirty = TRUE; r300->vertex_arrays_dirty = TRUE;
} else { } else {
util_copy_vertex_buffers(r300->vertex_buffer,
&r300->nr_vertex_buffers,
buffers, count);
draw_set_vertex_buffers(r300->draw, count, buffers); draw_set_vertex_buffers(r300->draw, count, buffers);
} }
} }