-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Does anyone object to me cherry picking the following series to 7.9 and 7.10? It's a fairly low-impact refactor of extension string handling. All of these changes have been on master for about a month without any apparent issue. There were some build issues, but Vinson's fixes for those are included in the list.
Several patches in the series remove some extension strings that we don't actually support. None of our drivers (any drivers?) support GL_OES_stencil1 or GL_OES_stencil4, and i915 doesn't support GL_OES_standard_derivatives (neither does r300). The stencil extensions can be removed other ways, but removing GL_OES_standard_derivatives in just the i915 driver would result in a divergence between the stable branches and master. This seems undesirable. commit 9b260c377f5b437b7e03607fefa022459ef758ed Author: Chad Versace <chad.vers...@intel.com> Date: Sun Jan 9 10:53:52 2011 -0800 mesa: Refactor handling of extension strings Place GL, GLES1, and GLES2 extensions in a unified extension table. This allows one to enable, disable, and query the status of GLES1 and GLES2 extensions by name. When tested on Intel Ironlake, this patch did not alter the extension string [as given by glGetString(GL_EXTENSIONS)] for any API. Reviewed-by: Ian Romanick <i...@freedesktop.org> Reviewed-by: Brian Paul <bri...@vmware.com> commit 19418e921af0efce198627d0ce6c92660797d011 Author: Chad Versace <chad.vers...@intel.com> Date: Sun Jan 9 21:53:52 2011 -0800 mesa: Add/remove extensions in extension string Add GL_OES_stencil8 to ES2. Remove the following: GL_OES_compressed_paletted_texture : ES1 GL_OES_depth32 : ES1, ES2 GL_OES_stencil1 : ES1, ES2 GL_OES_stencil4 : ES1, ES2 Mesa advertised these extensions, but did not actually support them. Reviewed-by: Ian Romanick <i...@freedesktop.org> commit 039150169e99be28d8b172a95a07032a3c862585 Author: Chad Versace <chad.vers...@intel.com> Date: Tue Jan 11 14:56:13 2011 -0800 mesa: Change dependencies of some OES extension strings Change all OES extension strings that depend on ARB_framebuffer_object to instead depend on EXT_framebuffer_object. Reviewed-by: Ian Romanick <i...@freedesktop.org> commit a7b5664c05a7a0bdc999caedf2dea17fee6bb5c8 Author: Chad Versace <chad.vers...@intel.com> Date: Wed Jan 12 15:21:23 2011 -0800 mesa: Change OES_point_sprite to depend on ARB_point_sprite The extension string in GLES1 contexts always advertised GL_OES_point_sprite. Now advertisement depends on ARB_point_sprite being enabled. Reviewed-by: Ian Romanick <i...@freedesktop.org> commit 356e2e962f424215b41bcf67d7114b83471e8813 Author: Vinson Lee <v...@vmware.com> Date: Wed Jan 12 16:23:11 2011 -0800 mesa: Move declaration before code in extensions.c. Fixes SCons build. commit 31b10516636043b8d92ce518acf6afb27d82a2d1 Author: Vinson Lee <v...@vmware.com> Date: Wed Jan 12 17:43:28 2011 -0800 mesa: Move loop variable declarations outside for loop in extensions.c. Fixes MSVC build. commit 78838b2d1bd88f948030cd60479b832b661ccd3c Author: Chad Versace <chad.vers...@intel.com> Date: Wed Jan 12 15:47:26 2011 -0800 mesa: Change OES_standard_derivatives to be stand-alone extension Add a bit in struct gl_extensions for OES_standard_derivatives, and enable the bit by default. Advertise the extension only if the bit is enabled. Previously, OES_standard_derivatives was advertised in GLES2 contexts if ARB_framebuffer_object was enabled. commit 7b9dc40b0d984ca2da915224517d5ba9d633f32a Author: Chad Versace <chad.vers...@intel.com> Date: Wed Jan 12 16:09:37 2011 -0800 i915: Disable extension OES_standard_derivatives OES_standard_derivatives must be manually disabled for i915 because Mesa enables it by default. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org/ iEYEARECAAYFAk1VwAcACgkQX1gOwKyEAw99FwCfZuDPvdqKzqMwV0AXIKPaYZHe IaAAoJM6m9TLfMSLw3EkBfxTkA6E75Gy =azsG -----END PGP SIGNATURE----- _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev