From: Jason Ekstrand Date: Wed, 22 Jun 2016 04:58:23 +0000 (-0700) Subject: i965/gen4: Pull texture formats from the texture object not the miptree X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ee39d3ba918de9d52d79bdee6db2c120bcf0f28e;p=mesa.git i965/gen4: Pull texture formats from the texture object not the miptree This makes texture views sort-of work. It doesn't add full texture view support for gen4-5 but it is enough to fix the GL_ARB_copy_image formats piglit test on Iron Lake. Signed-off-by: Jason Ekstrand Reviewed-by: Kenneth Graunke Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=83036 Cc: "11.1 11.2 12.0" --- 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 133a944f767..b07bf19daf4 100644 --- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c +++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c @@ -335,7 +335,7 @@ brw_update_texture_surface(struct gl_context *ctx, surf = brw_state_batch(brw, AUB_TRACE_SURFACE_STATE, 6 * 4, 32, surf_offset); - uint32_t tex_format = translate_tex_format(brw, mt->format, + uint32_t tex_format = translate_tex_format(brw, intelObj->_Format, sampler->sRGBDecode); if (tObj->Target == GL_TEXTURE_EXTERNAL_OES) {