fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-05 14:50:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

st/mesa: unify fail paths for update_single_texture

Browse source 
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
This commit is contained in:
Marek Olšák 2017-06-12 19:29:37 +02:00
parent d14bb37a0a
commit f368ea37a2
2 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/mesa/state_tracker/st_atom_texture.c
View file

@ -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;

4
src/mesa/state_tracker/st_sampler_view.c
View file

@ -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) {