summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
diff options
context:
space:
mode:
authorJason Ekstrand <jason.ekstrand@intel.com>2016-06-08 19:56:46 -0700
committerJason Ekstrand <jason.ekstrand@intel.com>2016-06-08 21:57:57 -0700
commit037ce5d7343829a69ec9c7361a0964bc1366b019 (patch)
tree1363226b7b6888c47cac918a5547e1a408ee73ef /src/mesa/drivers/dri/i965/brw_wm_surface_state.c
parentdc81b3ad43dde0815baf957e7cf4c633d6f350f8 (diff)
downloadexternal_mesa3d-037ce5d7343829a69ec9c7361a0964bc1366b019.zip
external_mesa3d-037ce5d7343829a69ec9c7361a0964bc1366b019.tar.gz
external_mesa3d-037ce5d7343829a69ec9c7361a0964bc1366b019.tar.bz2
i965: Emit surface states for extra planes prior to gen8
When Kristian implemented GL_TEXTURE_EXTERNAL_OES, he hooked it up for gen8 but not for gen7 or earlier. It all works, we just need to emit the states for the extra planes. Signed-off-by: Jason Ekstrand <jason@jlekstrand.net> Reviewed-by: Kristian Høgsberg <krh@bitplanet.net> Cc: "12.0" <mesa-stable@lists.freedesktop.org>
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_wm_surface_state.c')
-rw-r--r--src/mesa/drivers/dri/i965/brw_wm_surface_state.c9
1 files changed, 9 insertions, 0 deletions
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 b73d5d5..133a944 100644
--- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
+++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
@@ -338,6 +338,15 @@ brw_update_texture_surface(struct gl_context *ctx,
uint32_t tex_format = translate_tex_format(brw, mt->format,
sampler->sRGBDecode);
+ if (tObj->Target == GL_TEXTURE_EXTERNAL_OES) {
+ if (plane > 0)
+ mt = mt->plane[plane - 1];
+ if (mt == NULL)
+ return;
+
+ tex_format = translate_tex_format(brw, mt->format, sampler->sRGBDecode);
+ }
+
if (for_gather) {
/* Sandybridge's gather4 message is broken for integer formats.
* To work around this, we pretend the surface is UNORM for