projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7b38f94
)
r300g: skip null vertex buffers
author
Marek Olšák
<maraeo@gmail.com>
Sat, 20 Mar 2010 20:26:19 +0000
(21:26 +0100)
committer
Marek Olšák
<maraeo@gmail.com>
Sun, 21 Mar 2010 01:19:55 +0000
(
02:19
+0100)
src/gallium/drivers/r300/r300_state.c
patch
|
blob
|
history
diff --git
a/src/gallium/drivers/r300/r300_state.c
b/src/gallium/drivers/r300/r300_state.c
index 6328374e30153e00da5a90cea4d713d475c426f5..7ab76bfb8d319a1b28da7f7bf8e0c996897890d9 100644
(file)
--- a/
src/gallium/drivers/r300/r300_state.c
+++ b/
src/gallium/drivers/r300/r300_state.c
@@
-1039,7
+1039,6
@@
r300_create_sampler_view(struct pipe_context *pipe,
return view;
}
-
static void
r300_sampler_view_destroy(struct pipe_context *pipe,
struct pipe_sampler_view *view)
@@
-1125,6
+1124,12
@@
static void r300_set_vertex_buffers(struct pipe_context* pipe,
/* Reference our buffer. */
pipe_buffer_reference(&r300->vertex_buffer[i].buffer, vbo->buffer);
+
+ /* Skip NULL buffers */
+ if (!buffers[i].buffer) {
+ continue;
+ }
+
if (r300_buffer_is_user_buffer(vbo->buffer)) {
any_user_buffer = TRUE;
}