diff options
author | Keith Whitwell <keithw@vmware.com> | 2010-11-03 10:24:28 +0000 |
---|---|---|
committer | Keith Whitwell <keithw@vmware.com> | 2010-11-03 10:55:22 +0000 |
commit | b3462601cb69f277b9aafc2ee5179a0c2cf6cbcd (patch) | |
tree | e7904c1fdae0cafa13f1f083cfbfbf4605c526a0 /src | |
parent | 3f7876d76f0dabfe0be7a7edb44946334a6fedc2 (diff) |
evergreeng: protect against null constant buffers
Should do better than this and actually unbind the buffer, but haven't
yet gotten it to work.
Diffstat (limited to 'src')
-rw-r--r-- | src/gallium/drivers/r600/evergreen_state.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/gallium/drivers/r600/evergreen_state.c b/src/gallium/drivers/r600/evergreen_state.c index 7222348506..ce8e93a1d2 100644 --- a/src/gallium/drivers/r600/evergreen_state.c +++ b/src/gallium/drivers/r600/evergreen_state.c @@ -826,6 +826,13 @@ static void evergreen_set_constant_buffer(struct pipe_context *ctx, uint shader, struct r600_pipe_context *rctx = (struct r600_pipe_context *)ctx; struct r600_resource *rbuffer = (struct r600_resource*)buffer; + /* Note that the state tracker can unbind constant buffers by + * passing NULL here. + */ + if (buffer == NULL) { + return; + } + switch (shader) { case PIPE_SHADER_VERTEX: rctx->vs_const_buffer.nregs = 0; |