diff options
author | Michal Krol <[email protected]> | 2010-03-11 15:30:21 +0100 |
---|---|---|
committer | Michal Krol <[email protected]> | 2010-03-11 15:30:21 +0100 |
commit | 530b9910c2fd25344e6d28b6d9aa0eaad31618e7 (patch) | |
tree | 49633cd9042271cf105c35c3367cab315d000917 /src/gallium/drivers/r300 | |
parent | 252dc5f897f9d124459e3afebf6686d1fe271511 (diff) |
gallium: Check for OOM condition when creating a sampler view.
Diffstat (limited to 'src/gallium/drivers/r300')
-rw-r--r-- | src/gallium/drivers/r300/r300_state.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/gallium/drivers/r300/r300_state.c b/src/gallium/drivers/r300/r300_state.c index 09bbf6c60e2..d73ec78fda8 100644 --- a/src/gallium/drivers/r300/r300_state.c +++ b/src/gallium/drivers/r300/r300_state.c @@ -980,11 +980,13 @@ r300_create_sampler_view(struct pipe_context *pipe, struct r300_context *r300 = r300_context(pipe); struct pipe_sampler_view *view = CALLOC_STRUCT(pipe_sampler_view); - *view = *templ; - view->reference.count = 1; - view->texture = NULL; - pipe_texture_reference(&view->texture, texture); - view->context = pipe; + if (view) { + *view = *templ; + view->reference.count = 1; + view->texture = NULL; + pipe_texture_reference(&view->texture, texture); + view->context = pipe; + } return view; } |