diff options
| author | marha <marha@users.sourceforge.net> | 2011-05-10 13:36:25 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-05-10 13:36:25 +0000 |
| commit | 2e5094b5a8e6241621cbf8c3e41b618347de7e2f (patch) | |
| tree | 5e6023f9a98e76859ed4d6184f4e4ae50877db7a /mesalib/src/mesa/main | |
| parent | 495e1bd0f33256db726731f949d2a95e75d106b8 (diff) | |
| parent | 0f6aea154580c2f220be98d12108dd7d316c21f6 (diff) | |
| download | vcxsrv-2e5094b5a8e6241621cbf8c3e41b618347de7e2f.tar.gz vcxsrv-2e5094b5a8e6241621cbf8c3e41b618347de7e2f.tar.bz2 vcxsrv-2e5094b5a8e6241621cbf8c3e41b618347de7e2f.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/mesa/main')
| -rw-r--r-- | mesalib/src/mesa/main/extensions.c | 2 | ||||
| -rw-r--r-- | mesalib/src/mesa/main/mtypes.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/mesalib/src/mesa/main/extensions.c b/mesalib/src/mesa/main/extensions.c index e2413f7a9..ce3f9df10 100644 --- a/mesalib/src/mesa/main/extensions.c +++ b/mesalib/src/mesa/main/extensions.c @@ -112,6 +112,7 @@ static const struct extension extension_table[] = { { "GL_ARB_seamless_cube_map", o(ARB_seamless_cube_map), GL, 2009 },
{ "GL_ARB_shader_objects", o(ARB_shader_objects), GL, 2002 },
{ "GL_ARB_shader_stencil_export", o(ARB_shader_stencil_export), GL, 2009 },
+ { "GL_ARB_shader_texture_lod", o(ARB_shader_texture_lod), GL, 2009 },
{ "GL_ARB_shading_language_100", o(ARB_shading_language_100), GL, 2003 },
{ "GL_ARB_shadow_ambient", o(ARB_shadow_ambient), GL, 2001 },
{ "GL_ARB_shadow", o(ARB_shadow), GL, 2001 },
@@ -143,7 +144,6 @@ static const struct extension extension_table[] = { { "GL_ARB_vertex_shader", o(ARB_vertex_shader), GL, 2002 },
{ "GL_ARB_vertex_type_2_10_10_10_rev", o(ARB_vertex_type_2_10_10_10_rev), GL, 2009 },
{ "GL_ARB_window_pos", o(ARB_window_pos), GL, 2001 },
-
/* EXT extensions */
{ "GL_EXT_abgr", o(EXT_abgr), GL, 1995 },
{ "GL_EXT_bgra", o(EXT_bgra), GL, 1995 },
diff --git a/mesalib/src/mesa/main/mtypes.h b/mesalib/src/mesa/main/mtypes.h index 4ec15d1e2..acf95c81a 100644 --- a/mesalib/src/mesa/main/mtypes.h +++ b/mesalib/src/mesa/main/mtypes.h @@ -2793,6 +2793,7 @@ struct gl_extensions GLboolean ARB_seamless_cube_map;
GLboolean ARB_shader_objects;
GLboolean ARB_shader_stencil_export;
+ GLboolean ARB_shader_texture_lod;
GLboolean ARB_shading_language_100;
GLboolean ARB_shadow;
GLboolean ARB_shadow_ambient;
|