From f368ea37a2cd79051abf3be46c6bb1444aa05244 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Mon, 12 Jun 2017 19:29:37 +0200 Subject: [PATCH] st/mesa: unify fail paths for update_single_texture MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reviewed-by: Nicolai Hähnle --- src/mesa/state_tracker/st_atom_texture.c | 5 ++--- src/mesa/state_tracker/st_sampler_view.c | 4 ---- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/mesa/state_tracker/st_atom_texture.c b/src/mesa/state_tracker/st_atom_texture.c index cb6b4005fa6..81bf62908f1 100644 --- a/src/mesa/state_tracker/st_atom_texture.c +++ b/src/mesa/state_tracker/st_atom_texture.c @@ -64,7 +64,6 @@ st_update_single_texture(struct st_context *st, const struct gl_sampler_object *samp; struct gl_texture_object *texObj; struct st_texture_object *stObj; - GLboolean retval; samp = _mesa_get_samplerobj(ctx, texUnit); @@ -78,8 +77,8 @@ st_update_single_texture(struct st_context *st, return; } - retval = st_finalize_texture(ctx, st->pipe, texObj, 0); - if (!retval) { + if (!st_finalize_texture(ctx, st->pipe, texObj, 0) || + !stObj->pt) { /* out of mem */ *sampler_view = NULL; return; diff --git a/src/mesa/state_tracker/st_sampler_view.c b/src/mesa/state_tracker/st_sampler_view.c index 7a8d05d710a..fbf0aaeb03a 100644 --- a/src/mesa/state_tracker/st_sampler_view.c +++ b/src/mesa/state_tracker/st_sampler_view.c @@ -408,10 +408,6 @@ st_get_texture_sampler_view_from_stobj(struct st_context *st, { struct pipe_sampler_view **sv; - if (!stObj || !stObj->pt) { - return NULL; - } - sv = st_texture_get_sampler_view(st, stObj); if (*sv) { -- 2.30.2