From: Alejandro Piñeiro Date: Sat, 10 Sep 2016 22:07:30 +0000 (+0200) Subject: i965: check for GL_TEXTURE_EXTERNAL_OES at miptree_create_for_teximage X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6165603209f08cd95dc687363034f54978fe2c77;p=mesa.git i965: check for GL_TEXTURE_EXTERNAL_OES at miptree_create_for_teximage Forgotten on commit "i965: Fix calculation of the image height at start level". Thanks to Ilia Mirkin for point it. Fixes the following regressions on Haswell and Broadwell: ES2-CTS.gtf.GL2ExtensionTests.egl_image_external.TestSimpleUnassociated (crash back to pass) ES2-CTS.gtf.GL2ExtensionTests.egl_image_external.TestSimple (crash back to fail) ES2-CTS.gtf.GL2ExtensionTests.egl_image_external.TestVertexShader (crash back to fail) https://bugs.freedesktop.org/show_bug.cgi?id=97761 Reviewed-by: Jason Ekstrand --- diff --git a/src/mesa/drivers/dri/i965/intel_tex_image.c b/src/mesa/drivers/dri/i965/intel_tex_image.c index 6142a5fae35..f204db3bd90 100644 --- a/src/mesa/drivers/dri/i965/intel_tex_image.c +++ b/src/mesa/drivers/dri/i965/intel_tex_image.c @@ -50,6 +50,7 @@ intel_miptree_create_for_teximage(struct brw_context *brw, case GL_TEXTURE_2D_MULTISAMPLE: case GL_TEXTURE_2D_MULTISAMPLE_ARRAY: case GL_TEXTURE_RECTANGLE: + case GL_TEXTURE_EXTERNAL_OES: assert(intelImage->base.Base.Level == 0); break; case GL_TEXTURE_3D: