diff options
| author | Jordan Justen <jordan.l.justen@intel.com> | 2016-06-11 18:16:47 -0700 |
|---|---|---|
| committer | Jordan Justen <jordan.l.justen@intel.com> | 2016-06-24 18:13:18 -0700 |
| commit | 727a9b24933d384f5440ed4318fb720ed11d6dd1 (patch) | |
| tree | ed6e4f3bb50799108e3df91b29be2829529e1782 /src/mesa/drivers/dri/i965/brw_wm_surface_state.c | |
| parent | c4a6b0d2d222667944f78a7688936534b2be0e96 (diff) | |
| download | external_mesa3d-727a9b24933d384f5440ed4318fb720ed11d6dd1.zip external_mesa3d-727a9b24933d384f5440ed4318fb720ed11d6dd1.tar.gz external_mesa3d-727a9b24933d384f5440ed4318fb720ed11d6dd1.tar.bz2 | |
i965: Skip update_texture_surface when the plane doesn't exist
Reported-by: Grazvydas Ignotas <notasas@gmail.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=96607
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Cc: Kristian Høgsberg <krh@bitplanet.net>
Cc: "12.0" <mesa-stable@lists.freedesktop.org>
Reviewed-by: Chad Versace <chad.versace@intel.com>
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.c | 15 |
1 files changed, 6 insertions, 9 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 cfce2c9..d241ec9 100644 --- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c +++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c @@ -307,21 +307,18 @@ brw_update_texture_surface(struct gl_context *ctx, return; } + if (plane > 0) { + if (mt->plane[plane - 1] == NULL) + return; + mt = mt->plane[plane - 1]; + } + surf = brw_state_batch(brw, AUB_TRACE_SURFACE_STATE, 6 * 4, 32, surf_offset); uint32_t tex_format = translate_tex_format(brw, intelObj->_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 |