-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Ian, I have amended patch 1/2 with the following. It replaces all occurences of 0 in the extension table with DISABLE. On the changed lines, it also replaces dummy_true with dummy_false.
- --- src/mesa/main/extensions.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c index d49cf3a..851bf9e 100644 - --- a/src/mesa/main/extensions.c +++ b/src/mesa/main/extensions.c @@ -38,6 +38,7 @@ #include "mtypes.h" enum { + DISABLE = 0, GL = 1 << API_OPENGL, ES1 = 1 << API_OPENGLES, ES2 = 1 << API_OPENGLES2, @@ -207,9 +208,9 @@ static const struct extension extension_table[] = { { "GL_OES_blend_func_separate", o(EXT_blend_func_separate), ES1 }, { "GL_OES_blend_subtract", o(EXT_blend_subtract), ES1 }, { "GL_OES_byte_coordinates", o(dummy_true), ES1 }, - - { "GL_OES_compressed_paletted_texture", o(dummy_true), 0 }, + { "GL_OES_compressed_paletted_texture", o(dummy_false), DISABLE }, { "GL_OES_depth24", o(ARB_framebuffer_object), ES1 | ES2 }, - - { "GL_OES_depth32", o(ARB_framebuffer_object), 0 }, + { "GL_OES_depth32", o(dummy_false), DISABLE }, { "GL_OES_depth_texture", o(ARB_depth_texture), ES2 }, #if FEATURE_OES_draw_texture { "GL_OES_draw_texture", o(OES_draw_texture), ES1 | ES2 }, @@ -232,12 +233,12 @@ static const struct extension extension_table[] = { { "GL_OES_rgb8_rgba8", o(ARB_framebuffer_object), ES1 | ES2 }, { "GL_OES_single_precision", o(dummy_true), ES1 }, { "GL_OES_standard_derivatives", o(ARB_fragment_shader), ES2 }, - - { "GL_OES_stencil1", o(ARB_framebuffer_object), 0 }, - - { "GL_OES_stencil4", o(ARB_framebuffer_object), 0 }, + { "GL_OES_stencil1", o(dummy_false), DISABLE }, + { "GL_OES_stencil4", o(dummy_false), DISABLE }, { "GL_OES_stencil8", o(ARB_framebuffer_object), ES1 | ES2 }, { "GL_OES_stencil_wrap", o(EXT_stencil_wrap), ES1 }, /* GL_OES_texture_3D is disabled due to missing GLSL support. */ - - { "GL_OES_texture_3D", o(EXT_texture3D), 0 }, + { "GL_OES_texture_3D", o(EXT_texture3D), DISABLE }, { "GL_OES_texture_cube_map", o(ARB_texture_cube_map), ES1 }, { "GL_OES_texture_env_crossbar", o(ARB_texture_env_crossbar), ES1 }, { "GL_OES_texture_mirrored_repeat", o(ARB_texture_mirrored_repeat), ES1 }, - -- 1.7.3.3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAEBAgAGBQJNLOlaAAoJEAIvNt057x8iG3UP/1Aoy2fMKANMsu/UuLDAXCje lbYEPoHxB1hWUA4QoslLBWI/TiLXBExS8xccpYfzeK3R2yxmOv3KbwdGucVhELu3 jELuNyRZMvuU/MbC6CS5bLtwo6yDiVglDSCA566tbtCiXS654TI0Ldm00JQa1Wcd 6CF9IMlmL1M31bQ0fyegooAW+Uv/D56oJB6kqO6BqVYoPaohD56JArKCgTDbB9BU GsK7lie5DrSIkRp4aHTvHP27eytGY/n7FxhwBVr7R9qSXXddFFXyrDAM0h/5EVoE oxY+7tCC/berCbewcsqFnH6GaZ5FMl2QLdC7K4VOsM5qDNVXjceqwgAS2s3wDAHK iSUQXbRZMPDCcIibXn5rrB3qqkHNUdMumyzNhZCIPbE/yiB5M7P8Cl2W6MQvk7qW 6x09a3X2hhR/hkTLyHT4vE41FaTezHUbweB4tr760mmDrxeBMXWyU/HqZXO+HFSd K//EG+TVP6iApzmlwxlJW67ooSsjpztgeMDXdDcD8AZGFWMfEHSjI8R4EkedU+kr NAydOPLdr+du7Z2+0ZBC7HSZMiF99iJ5eMTk5Fn8KAqW9/8HvGLustjYuu5N9zU8 zN0RwTO35lFHCUe+rDdW2uzR/U5hdE64VgUy7qpC8DX57+81PNjmiGrMvI88r0YY ym7qF1TILmikOCh5EOkx =n/6c -----END PGP SIGNATURE----- _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev