On Fri, Nov 17, 2017 at 10:22:37AM -0800, Nanley Chery wrote: > On Fri, Nov 17, 2017 at 05:07:09PM +0100, Juan A. Suarez Romero wrote: > > From section 8.7, page 179 of OpenGL ES 3.2 spec: > > > > An INVALID_OPERATION error is generated by CompressedTexImage3D > > if internalformat is one of the the formats in table 8.17 and target > > is not TEXTURE_2D_ARRAY, TEXTURE_CUBE_MAP_ARRAY or TEXTURE_3D. > > > > An INVALID_OPERATION error is generated by CompressedTexImage3D if > > internalformat is TEXTURE_CUBE_MAP_ARRAY and the “Cube Map Array” > > column of table 8.17 is not checked, or if internalformat is > > TEXTURE_3D and the “3D Tex.” column of table 8.17 is not checked. > > > > So far it was only considering TEXTURE_2D_ARRAY as valid target. But as > > "Cube Map Array" column is checked for all the cases, in practice we can > > consider also TEXTURE_CUBE_MAP_ARRAY. > > > > This fixes KHR-GLES32.core.texture_cube_map_array.etc2_texture > > --- > > src/mesa/main/teximage.c | 20 +++++++++++++++++++- > > 1 file changed, 19 insertions(+), 1 deletion(-) > > > > This patch is > Reviewed-by: Nanley Chery <nanley.g.ch...@intel.com> > > > diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c > > index 4ec6148bf42..3f3fcf6f84b 100644 > > --- a/src/mesa/main/teximage.c > > +++ b/src/mesa/main/teximage.c > > @@ -1412,8 +1412,26 @@ _mesa_target_can_be_compressed(const struct > > gl_context *ctx, GLenum target, > > * > > * This should also be applicable for glTexStorage3D(). Other > > available > > * targets for these functions are: TEXTURE_3D and > > TEXTURE_CUBE_MAP_ARRAY. > > + * > > + * Section 8.7, page 179 of OpenGL ES 3.2 adds: > > + * > > + * An INVALID_OPERATION error is generated by > > CompressedTexImage3D > > + * if internalformat is one of the the formats in table 8.17 > > and target is
Just FYI: this line and > > + * not TEXTURE_2D_ARRAY, TEXTURE_CUBE_MAP_ARRAY or TEXTURE_3D. > > + * > > + * An INVALID_OPERATION error is generated by > > CompressedTexImage3D > > + * if internalformat is TEXTURE_CUBE_MAP_ARRAY and the “Cube Map > > + * Array” column of table 8.17 is not checked, or if > > internalformat > > + * is TEXTURE_- 3D and the “3D Tex.” column of table 8.17 is not > > + * checked. > > + * > > + * The instances of <internalformat> above should say <target>. > > + * > > + * Such table 8.17 has checked "Cube Map Array" column for all the > > + * cases. So in practice, TEXTURE_CUBE_MAP_ARRAY is now valid for > > OpenGL ES 3.2 this line still extends past 80-chars. I missed it in my review earlier. -Nanley > > */ > > - if (layout == MESA_FORMAT_LAYOUT_ETC2 && _mesa_is_gles3(ctx)) > > + if (layout == MESA_FORMAT_LAYOUT_ETC2 && _mesa_is_gles3(ctx) && > > + !_mesa_is_gles32(ctx)) > > return write_error(error, GL_INVALID_OPERATION); > > target_can_be_compresed = _mesa_has_texture_cube_map_array(ctx); > > break; > > -- > > 2.13.6 > > _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
