diff options
| author | Nicolai Hähnle <[email protected]> | 2017-10-10 13:58:44 +0200 |
|---|---|---|
| committer | Nicolai Hähnle <[email protected]> | 2017-10-10 13:58:44 +0200 |
| commit | d245724399b7ac9e2ddf99d381f7fe092204006a (patch) | |
| tree | dfe3d07df0a1f8611496d66ef6607c93bd30a243 /src/mesa/state_tracker/st_cb_texture.c | |
| parent | a2c8812f919c59933605c5942d6613e14ec8b3d1 (diff) | |
st/mesa: fix switching from surface-based to non-surface-based textures
This can happen with surface-based texture objects derived from EGL
images, since those aren't immutable.
Fixes tests in dEQP-EGL.functional.sharing.gles2.multithread.random.images.teximage2d.* and others
Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/mesa/state_tracker/st_cb_texture.c')
| -rw-r--r-- | src/mesa/state_tracker/st_cb_texture.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c index b5006b05a7b..b0a95ecbc79 100644 --- a/src/mesa/state_tracker/st_cb_texture.c +++ b/src/mesa/state_tracker/st_cb_texture.c @@ -693,7 +693,8 @@ prep_teximage(struct gl_context *ctx, struct gl_texture_image *texImage, const GLuint level = texImage->Level; mesa_format texFormat; - _mesa_clear_texture_object(ctx, texObj); + assert(!st_texture_image(texImage)->pt); + _mesa_clear_texture_object(ctx, texObj, texImage); pipe_resource_reference(&stObj->pt, NULL); /* oops, need to init this image again */ |