From 1df2921d0b27cd6b93f8a22deed08b88d0ea22e7 Mon Sep 17 00:00:00 2001 From: Jordan Justen Date: Mon, 27 Jun 2016 13:31:33 -0700 Subject: i965: Fall back to miptree for surface state format on external images Signed-off-by: Jordan Justen --- src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c index 1298d4e5fc5..c7485068a48 100644 --- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c +++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c @@ -411,7 +411,8 @@ brw_update_texture_surface(struct gl_context *ctx, const unsigned swizzle = (unlikely(alpha_depth) ? SWIZZLE_XYZW : brw_get_texture_swizzle(&brw->ctx, obj)); - mesa_format mesa_fmt = plane == 0 ? intel_obj->_Format : mt->format; + mesa_format mesa_fmt = + obj->Target != GL_TEXTURE_EXTERNAL_OES ? intel_obj->_Format : mt->format; unsigned format = translate_tex_format(brw, mesa_fmt, sampler->sRGBDecode); -- cgit v1.2.3