svn merge ^/branches/released .

37 files changed, 39 insertions, 3 deletions

diff --git a/mesalib/src/mesa/program/program.c b/mesalib/src/mesa/program/program.c
index eff600685..8bd26d0d7 100644
--- a/mesalib/src/mesa/program/program.c
+++ b/mesalib/src/mesa/program/program.c
@@ -32,6 +32,7 @@
 #include "main/glheader.h"

 #include "main/context.h"

 #include "main/hash.h"

+#include "main/mfeatures.h"

 #include "program.h"

 #include "prog_cache.h"

 #include "prog_parameter.h"

diff --git a/mesalib/src/mesa/state_tracker/st_cb_accum.c b/mesalib/src/mesa/state_tracker/st_cb_accum.c
index 743c9b525..d4185b7e2 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_accum.c
+++ b/mesalib/src/mesa/state_tracker/st_cb_accum.c
@@ -33,6 +33,7 @@
 #include "main/imports.h"

 #include "main/image.h"

 #include "main/macros.h"

+#include "main/mfeatures.h"

 

 #include "st_debug.h"

 #include "st_context.h"

diff --git a/mesalib/src/mesa/state_tracker/st_cb_bitmap.c b/mesalib/src/mesa/state_tracker/st_cb_bitmap.c
index 6a3c06d54..a3e39dd49 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_bitmap.c
+++ b/mesalib/src/mesa/state_tracker/st_cb_bitmap.c
@@ -34,6 +34,7 @@
 #include "main/image.h"

 #include "main/bufferobj.h"

 #include "main/macros.h"

+#include "main/mfeatures.h"

 #include "program/program.h"

 #include "program/prog_print.h"

 

diff --git a/mesalib/src/mesa/state_tracker/st_cb_bitmap.h b/mesalib/src/mesa/state_tracker/st_cb_bitmap.h
index a0d2f9faa..cc6d82391 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_bitmap.h
+++ b/mesalib/src/mesa/state_tracker/st_cb_bitmap.h
@@ -31,6 +31,7 @@
 

 

 #include "main/compiler.h"

+#include "main/mfeatures.h"

 

 struct dd_function_table;

 struct st_context;

diff --git a/mesalib/src/mesa/state_tracker/st_cb_blit.c b/mesalib/src/mesa/state_tracker/st_cb_blit.c
index 466e1a85f..39499450d 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_blit.c
+++ b/mesalib/src/mesa/state_tracker/st_cb_blit.c
@@ -33,6 +33,7 @@
 #include "main/imports.h"

 #include "main/image.h"

 #include "main/macros.h"

+#include "main/mfeatures.h"

 

 #include "st_context.h"

 #include "st_texture.h"

diff --git a/mesalib/src/mesa/state_tracker/st_cb_blit.h b/mesalib/src/mesa/state_tracker/st_cb_blit.h
index fac11f364..e378e6789 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_blit.h
+++ b/mesalib/src/mesa/state_tracker/st_cb_blit.h
@@ -30,6 +30,7 @@
 

 

 #include "main/compiler.h"

+#include "main/mfeatures.h"

 

 struct dd_function_table;

 struct st_context;

diff --git a/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c b/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
index c348dd343..c4906d25d 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
+++ b/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
@@ -34,6 +34,7 @@
 #include "main/image.h"

 #include "main/bufferobj.h"

 #include "main/macros.h"

+#include "main/mfeatures.h"

 #include "main/mtypes.h"

 #include "main/pack.h"

 #include "main/texformat.h"

diff --git a/mesalib/src/mesa/state_tracker/st_cb_drawpixels.h b/mesalib/src/mesa/state_tracker/st_cb_drawpixels.h
index aa0f491fe..9c02263ea 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_drawpixels.h
+++ b/mesalib/src/mesa/state_tracker/st_cb_drawpixels.h
@@ -31,6 +31,7 @@
 

 

 #include "main/compiler.h"

+#include "main/mfeatures.h"

 

 struct dd_function_table;

 struct st_context;

diff --git a/mesalib/src/mesa/state_tracker/st_cb_drawtex.c b/mesalib/src/mesa/state_tracker/st_cb_drawtex.c
index 083742b1c..5976f1048 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_drawtex.c
+++ b/mesalib/src/mesa/state_tracker/st_cb_drawtex.c
@@ -15,6 +15,7 @@
 #include "main/imports.h"

 #include "main/image.h"

 #include "main/macros.h"

+#include "main/mfeatures.h"

 #include "program/program.h"

 #include "program/prog_print.h"

 

diff --git a/mesalib/src/mesa/state_tracker/st_cb_drawtex.h b/mesalib/src/mesa/state_tracker/st_cb_drawtex.h
index 48cf45e1f..0937b48f8 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_drawtex.h
+++ b/mesalib/src/mesa/state_tracker/st_cb_drawtex.h
@@ -11,6 +11,7 @@
 

 

 #include "main/compiler.h"

+#include "main/mfeatures.h"

 

 struct dd_function_table;

 struct st_context;

diff --git a/mesalib/src/mesa/state_tracker/st_cb_eglimage.c b/mesalib/src/mesa/state_tracker/st_cb_eglimage.c
index 0f5175713..d7518c0b4 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_eglimage.c
+++ b/mesalib/src/mesa/state_tracker/st_cb_eglimage.c
@@ -26,6 +26,7 @@
  *    Chia-I Wu <olv@lunarg.com>

  */

 

+#include "main/mfeatures.h"

 #include "main/texobj.h"

 #include "main/texfetch.h"

 #include "main/teximage.h"

diff --git a/mesalib/src/mesa/state_tracker/st_cb_eglimage.h b/mesalib/src/mesa/state_tracker/st_cb_eglimage.h
index 8757d08ff..b325b0608 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_eglimage.h
+++ b/mesalib/src/mesa/state_tracker/st_cb_eglimage.h
@@ -30,6 +30,7 @@
 #define ST_CB_EGLIMAGE_H

 

 #include "main/compiler.h"

+#include "main/mfeatures.h"

 

 struct dd_function_table;

 

diff --git a/mesalib/src/mesa/state_tracker/st_cb_fbo.c b/mesalib/src/mesa/state_tracker/st_cb_fbo.c
index d6df2a204..fa1e35de0 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_fbo.c
+++ b/mesalib/src/mesa/state_tracker/st_cb_fbo.c
@@ -38,6 +38,7 @@
 #include "main/fbobject.h"

 #include "main/framebuffer.h"

 #include "main/macros.h"

+#include "main/mfeatures.h"

 #include "main/renderbuffer.h"

 

 #include "pipe/p_context.h"

diff --git a/mesalib/src/mesa/state_tracker/st_cb_feedback.c b/mesalib/src/mesa/state_tracker/st_cb_feedback.c
index 6717c4c7a..d390ba192 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_feedback.c
+++ b/mesalib/src/mesa/state_tracker/st_cb_feedback.c
@@ -40,6 +40,7 @@
 #include "main/imports.h"

 #include "main/context.h"

 #include "main/feedback.h"

+#include "main/mfeatures.h"

 

 #include "vbo/vbo.h"

 

diff --git a/mesalib/src/mesa/state_tracker/st_cb_feedback.h b/mesalib/src/mesa/state_tracker/st_cb_feedback.h
index 761542dcd..3acb5b5b3 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_feedback.h
+++ b/mesalib/src/mesa/state_tracker/st_cb_feedback.h
@@ -31,6 +31,7 @@
 

 

 #include "main/compiler.h"

+#include "main/mfeatures.h"

 

 struct dd_function_table;

 

diff --git a/mesalib/src/mesa/state_tracker/st_cb_queryobj.c b/mesalib/src/mesa/state_tracker/st_cb_queryobj.c
index c589d7568..5b9e648d0 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_queryobj.c
+++ b/mesalib/src/mesa/state_tracker/st_cb_queryobj.c
@@ -35,6 +35,7 @@
 

 #include "main/imports.h"

 #include "main/context.h"

+#include "main/mfeatures.h"

 

 #include "pipe/p_context.h"

 #include "pipe/p_defines.h"

diff --git a/mesalib/src/mesa/state_tracker/st_cb_queryobj.h b/mesalib/src/mesa/state_tracker/st_cb_queryobj.h
index c755211b2..638dba9ec 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_queryobj.h
+++ b/mesalib/src/mesa/state_tracker/st_cb_queryobj.h
@@ -29,6 +29,7 @@
 #define ST_CB_QUERYOBJ_H

 

 

+#include "main/mfeatures.h"

 #include "main/mtypes.h"

 

 /**

diff --git a/mesalib/src/mesa/state_tracker/st_cb_rasterpos.c b/mesalib/src/mesa/state_tracker/st_cb_rasterpos.c
index 873560f45..2e9eb7265 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_rasterpos.c
+++ b/mesalib/src/mesa/state_tracker/st_cb_rasterpos.c
@@ -38,6 +38,7 @@
 

 #include "main/imports.h"

 #include "main/macros.h"

+#include "main/mfeatures.h"

 #include "main/feedback.h"

 

 #include "st_context.h"

diff --git a/mesalib/src/mesa/state_tracker/st_cb_rasterpos.h b/mesalib/src/mesa/state_tracker/st_cb_rasterpos.h
index 35fe92046..c8fe9d135 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_rasterpos.h
+++ b/mesalib/src/mesa/state_tracker/st_cb_rasterpos.h
@@ -30,6 +30,7 @@
 

 

 #include "main/compiler.h"

+#include "main/mfeatures.h"

 

 struct dd_function_table;

 

diff --git a/mesalib/src/mesa/state_tracker/st_cb_xformfb.c b/mesalib/src/mesa/state_tracker/st_cb_xformfb.c
index f4440a5f5..378b4822b 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_xformfb.c
+++ b/mesalib/src/mesa/state_tracker/st_cb_xformfb.c
@@ -35,6 +35,7 @@
 

 #include "main/imports.h"

 #include "main/context.h"

+#include "main/mfeatures.h"

 #include "main/transformfeedback.h"

 

 #include "st_cb_xformfb.h"

diff --git a/mesalib/src/mesa/state_tracker/st_cb_xformfb.h b/mesalib/src/mesa/state_tracker/st_cb_xformfb.h
index f18b68bdb..e07f500ce 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_xformfb.h
+++ b/mesalib/src/mesa/state_tracker/st_cb_xformfb.h
@@ -30,6 +30,7 @@
 

 

 #include "main/compiler.h"

+#include "main/mfeatures.h"

 

 struct dd_function_table;

 

diff --git a/mesalib/src/mesa/state_tracker/st_draw.c b/mesalib/src/mesa/state_tracker/st_draw.c
index 163d2d36e..ece051fc8 100644
--- a/mesalib/src/mesa/state_tracker/st_draw.c
+++ b/mesalib/src/mesa/state_tracker/st_draw.c
@@ -43,6 +43,7 @@
 #include "main/imports.h"

 #include "main/image.h"

 #include "main/macros.h"

+#include "main/mfeatures.h"

 #include "program/prog_uniform.h"

 

 #include "vbo/vbo.h"

diff --git a/mesalib/src/mesa/state_tracker/st_draw_feedback.c b/mesalib/src/mesa/state_tracker/st_draw_feedback.c
index 957912221..72ed75e73 100644
--- a/mesalib/src/mesa/state_tracker/st_draw_feedback.c
+++ b/mesalib/src/mesa/state_tracker/st_draw_feedback.c
@@ -28,6 +28,7 @@
 #include "main/imports.h"

 #include "main/image.h"

 #include "main/macros.h"

+#include "main/mfeatures.h"

 

 #include "vbo/vbo.h"

 

diff --git a/mesalib/src/mesa/state_tracker/st_extensions.c b/mesalib/src/mesa/state_tracker/st_extensions.c
index 574730120..4f8862773 100644
--- a/mesalib/src/mesa/state_tracker/st_extensions.c
+++ b/mesalib/src/mesa/state_tracker/st_extensions.c
@@ -29,6 +29,7 @@
 #include "main/imports.h"

 #include "main/context.h"

 #include "main/macros.h"

+#include "main/mfeatures.h"

 

 #include "pipe/p_context.h"

 #include "pipe/p_defines.h"

diff --git a/mesalib/src/mesa/state_tracker/st_format.c b/mesalib/src/mesa/state_tracker/st_format.c
index 11253d11a..bd20548ac 100644
--- a/mesalib/src/mesa/state_tracker/st_format.c
+++ b/mesalib/src/mesa/state_tracker/st_format.c
@@ -37,6 +37,7 @@
 #include "main/texstore.h"

 #include "main/image.h"

 #include "main/macros.h"

+#include "main/mfeatures.h"

 

 #include "pipe/p_context.h"

 #include "pipe/p_defines.h"

diff --git a/mesalib/src/mesa/state_tracker/st_manager.c b/mesalib/src/mesa/state_tracker/st_manager.c
index 7952bb6ff..3b54eb7b8 100644
--- a/mesalib/src/mesa/state_tracker/st_manager.c
+++ b/mesalib/src/mesa/state_tracker/st_manager.c
@@ -38,6 +38,7 @@
 

 #include "main/mtypes.h"

 #include "main/context.h"

+#include "main/mfeatures.h"

 #include "main/texobj.h"

 #include "main/teximage.h"

 #include "main/texstate.h"

diff --git a/mesalib/src/mesa/state_tracker/st_program.c b/mesalib/src/mesa/state_tracker/st_program.c
index 50beaa766..f70e5005f 100644
--- a/mesalib/src/mesa/state_tracker/st_program.c
+++ b/mesalib/src/mesa/state_tracker/st_program.c
@@ -33,6 +33,7 @@
 

 #include "main/imports.h"

 #include "main/hash.h"

+#include "main/mfeatures.h"

 #include "main/mtypes.h"

 #include "program/prog_parameter.h"

 #include "program/prog_print.h"

diff --git a/mesalib/src/mesa/vbo/vbo_context.h b/mesalib/src/mesa/vbo/vbo_context.h
index 91953958b..df1d8c041 100644
--- a/mesalib/src/mesa/vbo/vbo_context.h
+++ b/mesalib/src/mesa/vbo/vbo_context.h
@@ -51,6 +51,7 @@
 #ifndef _VBO_CONTEXT_H

 #define _VBO_CONTEXT_H

 

+#include "main/mfeatures.h"

 #include "vbo.h"

 #include "vbo_attrib.h"

 #include "vbo_exec.h"

diff --git a/mesalib/src/mesa/vbo/vbo_exec.h b/mesalib/src/mesa/vbo/vbo_exec.h
index be3028941..2508016c0 100644
--- a/mesalib/src/mesa/vbo/vbo_exec.h
+++ b/mesalib/src/mesa/vbo/vbo_exec.h
@@ -34,6 +34,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __VBO_EXEC_H__

 #define __VBO_EXEC_H__

 

+#include "main/mfeatures.h"

 #include "main/mtypes.h"

 #include "vbo.h"

 #include "vbo_attrib.h"

diff --git a/mesalib/src/mesa/vbo/vbo_exec_api.c b/mesalib/src/mesa/vbo/vbo_exec_api.c
index b6ced258e..0c59c41ba 100644
--- a/mesalib/src/mesa/vbo/vbo_exec_api.c
+++ b/mesalib/src/mesa/vbo/vbo_exec_api.c
@@ -34,6 +34,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "main/bufferobj.h"

 #include "main/context.h"

 #include "main/macros.h"

+#include "main/mfeatures.h"

 #include "main/vtxfmt.h"

 #include "main/dlist.h"

 #include "main/eval.h"

diff --git a/mesalib/src/mesa/vbo/vbo_exec_draw.c b/mesalib/src/mesa/vbo/vbo_exec_draw.c
index ea2738421..048f3d170 100644
--- a/mesalib/src/mesa/vbo/vbo_exec_draw.c
+++ b/mesalib/src/mesa/vbo/vbo_exec_draw.c
@@ -29,6 +29,7 @@
 #include "main/bufferobj.h"

 #include "main/compiler.h"

 #include "main/enums.h"

+#include "main/mfeatures.h"

 #include "main/state.h"

 

 #include "vbo_context.h"

diff --git a/mesalib/src/mesa/vbo/vbo_save.c b/mesalib/src/mesa/vbo/vbo_save.c
index 87ced410c..4efc6e9d2 100644
--- a/mesalib/src/mesa/vbo/vbo_save.c
+++ b/mesalib/src/mesa/vbo/vbo_save.c
@@ -29,6 +29,7 @@
 #include "main/mtypes.h"

 #include "main/bufferobj.h"

 #include "main/imports.h"

+#include "main/mfeatures.h"

 

 #include "vbo_context.h"

 

diff --git a/mesalib/src/mesa/vbo/vbo_save.h b/mesalib/src/mesa/vbo/vbo_save.h
index 25704f827..873777f17 100644
--- a/mesalib/src/mesa/vbo/vbo_save.h
+++ b/mesalib/src/mesa/vbo/vbo_save.h
@@ -34,6 +34,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef VBO_SAVE_H

 #define VBO_SAVE_H

 

+#include "main/mfeatures.h"

 #include "main/mtypes.h"

 #include "vbo.h"

 #include "vbo_attrib.h"

diff --git a/mesalib/src/mesa/vbo/vbo_save_api.c b/mesalib/src/mesa/vbo/vbo_save_api.c
index 7c928820a..90ff39e55 100644
--- a/mesalib/src/mesa/vbo/vbo_save_api.c
+++ b/mesalib/src/mesa/vbo/vbo_save_api.c
@@ -74,6 +74,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "main/enums.h"

 #include "main/eval.h"

 #include "main/macros.h"

+#include "main/mfeatures.h"

 #include "main/api_noop.h"

 #include "main/api_validate.h"

 #include "main/api_arrayelt.h"

diff --git a/mesalib/src/mesa/vbo/vbo_save_draw.c b/mesalib/src/mesa/vbo/vbo_save_draw.c
index 5d189ba4d..6d8dbdb86 100644
--- a/mesalib/src/mesa/vbo/vbo_save_draw.c
+++ b/mesalib/src/mesa/vbo/vbo_save_draw.c
@@ -30,6 +30,7 @@
 #include "main/bufferobj.h"

 #include "main/context.h"

 #include "main/imports.h"

+#include "main/mfeatures.h"

 #include "main/mtypes.h"

 #include "main/macros.h"

 #include "main/light.h"

diff --git a/mesalib/src/mesa/vbo/vbo_save_loopback.c b/mesalib/src/mesa/vbo/vbo_save_loopback.c
index cc48e4a69..6a8860c78 100644
--- a/mesalib/src/mesa/vbo/vbo_save_loopback.c
+++ b/mesalib/src/mesa/vbo/vbo_save_loopback.c
@@ -29,6 +29,7 @@
 #include "main/glheader.h"

 #include "main/enums.h"

 #include "main/imports.h"

+#include "main/mfeatures.h"

 #include "main/mtypes.h"

 #include "main/dispatch.h"

 #include "glapi/glapi.h"

diff --git a/xorg-server/xkeyboard-config/symbols/inet b/xorg-server/xkeyboard-config/symbols/inet
index 478a15371..3868c8f9c 100644
--- a/xorg-server/xkeyboard-config/symbols/inet
+++ b/xorg-server/xkeyboard-config/symbols/inet
@@ -185,11 +185,11 @@ xkb_symbols "evdev" {
 //  key <I221>   {      [ ]       }; // KEY_SOUND

 //  key <I222>   {      [ ]       }; // KEY_QUESTION

     key <I223>   {      [ XF86Mail              ]       };

-//  key <I224>   {      [ XF86Messenger         ]       }; // KEY_CHAT

+    key <I224>   {      [ XF86Messenger         ]       }; // KEY_CHAT

     key <I225>   {      [ XF86Search            ]       };

-//  key <I226>   {      [ XF86Go                ]       }; // KEY_CONNECT

+    key <I226>   {      [ XF86Go                ]       }; // KEY_CONNECT

     key <I227>   {      [ XF86Finance           ]       };

-//  key <I228>   {      [ XF86Game              ]       }; // KEY_SPORT

+    key <I228>   {      [ XF86Game              ]       }; // KEY_SPORT

     key <I229>   {      [ XF86Shop              ]       };

 //  key <I230>   {      [ ]       }; // KEY_ALTERASE

     key <I231>   {      [ Cancel                ]       };