diff options
author | Dave Airlie <[email protected]> | 2017-06-20 15:50:37 +1000 |
---|---|---|
committer | Dave Airlie <[email protected]> | 2017-06-21 08:59:18 +1000 |
commit | 72c8c684582095fffb45457ab6bcc73742a871c4 (patch) | |
tree | 21682e245515a36a5528d13765281a9d1a65bbd3 /src/mesa/state_tracker/st_texture.c | |
parent | 030abc61091a38596427aa04022066719be9add5 (diff) |
st/mesa: fix assert to be simpler
I just noticed a warning with a non-debug build, but really
this could all be one line, and I'm not even 100% the assert
makes sense here.
Reviewed-by: Timothy Arceri <[email protected]>
Reviewed-by: Samuel Pitoiset <[email protected]>
Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/mesa/state_tracker/st_texture.c')
-rw-r--r-- | src/mesa/state_tracker/st_texture.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/mesa/state_tracker/st_texture.c b/src/mesa/state_tracker/st_texture.c index 9de3b9a2e9b..58636286eef 100644 --- a/src/mesa/state_tracker/st_texture.c +++ b/src/mesa/state_tracker/st_texture.c @@ -508,8 +508,6 @@ static GLuint64 st_create_texture_handle_from_unit(struct st_context *st, struct gl_program *prog, GLuint texUnit) { - struct gl_context *ctx = st->ctx; - struct gl_texture_object *texObj; struct pipe_context *pipe = st->pipe; struct pipe_sampler_view *view; struct pipe_sampler_state sampler; @@ -519,8 +517,7 @@ st_create_texture_handle_from_unit(struct st_context *st, st_convert_sampler_from_unit(st, &sampler, texUnit); - texObj = ctx->Texture.Unit[texUnit]._Current; - assert(texObj); + assert(st->ctx->Texture.Unit[texUnit]._Current); return pipe->create_texture_handle(pipe, view, &sampler); } |