diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2014-02-06 02:16:50 +0100 |
|---|---|---|
| committer | Carl Worth <cworth@cworth.org> | 2014-03-04 13:04:37 -0800 |
| commit | cfd8aed240583295374840f29d3f627c50e97216 (patch) | |
| tree | fad7056e9a2629eb2e442c2bb73da7476087e85d | |
| parent | 1b6aec4b5ab9441f979f6eae4d56787e7483cc39 (diff) | |
| download | mesa-cfd8aed240583295374840f29d3f627c50e97216.tar.gz | |
st/mesa: fix crash when a shader uses a TBO and it's not bound
This binds a NULL sampler view in that case.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=74251
Cc: "10.1" "10.0" <mesa-stable@lists.freedesktop.org>
Reviewed-by: Brian Paul <brianp@vmware.com>
(cherry picked from commit c6dbcf10dff1f8343a26081f5489ef732ebb5460)
| -rw-r--r-- | src/mesa/state_tracker/st_cb_texture.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c index faa9ee3f6c7..43475eda23b 100644 --- a/src/mesa/state_tracker/st_cb_texture.c +++ b/src/mesa/state_tracker/st_cb_texture.c @@ -1485,6 +1485,12 @@ st_finalize_texture(struct gl_context *ctx, if (tObj->Target == GL_TEXTURE_BUFFER) { struct st_buffer_object *st_obj = st_buffer_object(tObj->BufferObject); + if (!st_obj) { + pipe_resource_reference(&stObj->pt, NULL); + pipe_sampler_view_reference(&stObj->sampler_view, NULL); + return GL_TRUE; + } + if (st_obj->buffer != stObj->pt) { pipe_resource_reference(&stObj->pt, st_obj->buffer); pipe_sampler_view_release(st->pipe, &stObj->sampler_view); |