Merge remote-tracking branch 'origin/released'

* origin/released:
  mesa pixman git update 18 okt 2013

Conflicts:
	mesalib/include/GL/glext.h
	mesalib/include/GL/glxext.h

1 files changed, 67 insertions, 67 deletions

diff --git a/include/xcb/render.h b/include/xcb/render.h
index 3242c11a5..d00b45926 100644
--- a/include/xcb/render.h
+++ b/include/xcb/render.h
@@ -25,78 +25,78 @@ extern "C" {
 XCB_EXTERN xcb_extension_t xcb_render_id;

 

 typedef enum xcb_render_pict_type_t {

-    XCB_RENDER_PICT_TYPE_INDEXED,

-    XCB_RENDER_PICT_TYPE_DIRECT

+    XCB_RENDER_PICT_TYPE_INDEXED = 0,

+    XCB_RENDER_PICT_TYPE_DIRECT = 1

 } xcb_render_pict_type_t;

 

 typedef enum xcb_render_picture_enum_t {

-    XCB_RENDER_PICTURE_NONE

+    XCB_RENDER_PICTURE_NONE = 0

 } xcb_render_picture_enum_t;

 

 typedef enum xcb_render_pict_op_t {

-    XCB_RENDER_PICT_OP_CLEAR,

-    XCB_RENDER_PICT_OP_SRC,

-    XCB_RENDER_PICT_OP_DST,

-    XCB_RENDER_PICT_OP_OVER,

-    XCB_RENDER_PICT_OP_OVER_REVERSE,

-    XCB_RENDER_PICT_OP_IN,

-    XCB_RENDER_PICT_OP_IN_REVERSE,

-    XCB_RENDER_PICT_OP_OUT,

-    XCB_RENDER_PICT_OP_OUT_REVERSE,

-    XCB_RENDER_PICT_OP_ATOP,

-    XCB_RENDER_PICT_OP_ATOP_REVERSE,

-    XCB_RENDER_PICT_OP_XOR,

-    XCB_RENDER_PICT_OP_ADD,

-    XCB_RENDER_PICT_OP_SATURATE,

+    XCB_RENDER_PICT_OP_CLEAR = 0,

+    XCB_RENDER_PICT_OP_SRC = 1,

+    XCB_RENDER_PICT_OP_DST = 2,

+    XCB_RENDER_PICT_OP_OVER = 3,

+    XCB_RENDER_PICT_OP_OVER_REVERSE = 4,

+    XCB_RENDER_PICT_OP_IN = 5,

+    XCB_RENDER_PICT_OP_IN_REVERSE = 6,

+    XCB_RENDER_PICT_OP_OUT = 7,

+    XCB_RENDER_PICT_OP_OUT_REVERSE = 8,

+    XCB_RENDER_PICT_OP_ATOP = 9,

+    XCB_RENDER_PICT_OP_ATOP_REVERSE = 10,

+    XCB_RENDER_PICT_OP_XOR = 11,

+    XCB_RENDER_PICT_OP_ADD = 12,

+    XCB_RENDER_PICT_OP_SATURATE = 13,

     XCB_RENDER_PICT_OP_DISJOINT_CLEAR = 16,

-    XCB_RENDER_PICT_OP_DISJOINT_SRC,

-    XCB_RENDER_PICT_OP_DISJOINT_DST,

-    XCB_RENDER_PICT_OP_DISJOINT_OVER,

-    XCB_RENDER_PICT_OP_DISJOINT_OVER_REVERSE,

-    XCB_RENDER_PICT_OP_DISJOINT_IN,

-    XCB_RENDER_PICT_OP_DISJOINT_IN_REVERSE,

-    XCB_RENDER_PICT_OP_DISJOINT_OUT,

-    XCB_RENDER_PICT_OP_DISJOINT_OUT_REVERSE,

-    XCB_RENDER_PICT_OP_DISJOINT_ATOP,

-    XCB_RENDER_PICT_OP_DISJOINT_ATOP_REVERSE,

-    XCB_RENDER_PICT_OP_DISJOINT_XOR,

+    XCB_RENDER_PICT_OP_DISJOINT_SRC = 17,

+    XCB_RENDER_PICT_OP_DISJOINT_DST = 18,

+    XCB_RENDER_PICT_OP_DISJOINT_OVER = 19,

+    XCB_RENDER_PICT_OP_DISJOINT_OVER_REVERSE = 20,

+    XCB_RENDER_PICT_OP_DISJOINT_IN = 21,

+    XCB_RENDER_PICT_OP_DISJOINT_IN_REVERSE = 22,

+    XCB_RENDER_PICT_OP_DISJOINT_OUT = 23,

+    XCB_RENDER_PICT_OP_DISJOINT_OUT_REVERSE = 24,

+    XCB_RENDER_PICT_OP_DISJOINT_ATOP = 25,

+    XCB_RENDER_PICT_OP_DISJOINT_ATOP_REVERSE = 26,

+    XCB_RENDER_PICT_OP_DISJOINT_XOR = 27,

     XCB_RENDER_PICT_OP_CONJOINT_CLEAR = 32,

-    XCB_RENDER_PICT_OP_CONJOINT_SRC,

-    XCB_RENDER_PICT_OP_CONJOINT_DST,

-    XCB_RENDER_PICT_OP_CONJOINT_OVER,

-    XCB_RENDER_PICT_OP_CONJOINT_OVER_REVERSE,

-    XCB_RENDER_PICT_OP_CONJOINT_IN,

-    XCB_RENDER_PICT_OP_CONJOINT_IN_REVERSE,

-    XCB_RENDER_PICT_OP_CONJOINT_OUT,

-    XCB_RENDER_PICT_OP_CONJOINT_OUT_REVERSE,

-    XCB_RENDER_PICT_OP_CONJOINT_ATOP,

-    XCB_RENDER_PICT_OP_CONJOINT_ATOP_REVERSE,

-    XCB_RENDER_PICT_OP_CONJOINT_XOR,

+    XCB_RENDER_PICT_OP_CONJOINT_SRC = 33,

+    XCB_RENDER_PICT_OP_CONJOINT_DST = 34,

+    XCB_RENDER_PICT_OP_CONJOINT_OVER = 35,

+    XCB_RENDER_PICT_OP_CONJOINT_OVER_REVERSE = 36,

+    XCB_RENDER_PICT_OP_CONJOINT_IN = 37,

+    XCB_RENDER_PICT_OP_CONJOINT_IN_REVERSE = 38,

+    XCB_RENDER_PICT_OP_CONJOINT_OUT = 39,

+    XCB_RENDER_PICT_OP_CONJOINT_OUT_REVERSE = 40,

+    XCB_RENDER_PICT_OP_CONJOINT_ATOP = 41,

+    XCB_RENDER_PICT_OP_CONJOINT_ATOP_REVERSE = 42,

+    XCB_RENDER_PICT_OP_CONJOINT_XOR = 43,

     XCB_RENDER_PICT_OP_MULTIPLY = 48,

-    XCB_RENDER_PICT_OP_SCREEN,

-    XCB_RENDER_PICT_OP_OVERLAY,

-    XCB_RENDER_PICT_OP_DARKEN,

-    XCB_RENDER_PICT_OP_LIGHTEN,

-    XCB_RENDER_PICT_OP_COLOR_DODGE,

-    XCB_RENDER_PICT_OP_COLOR_BURN,

-    XCB_RENDER_PICT_OP_HARD_LIGHT,

-    XCB_RENDER_PICT_OP_SOFT_LIGHT,

-    XCB_RENDER_PICT_OP_DIFFERENCE,

-    XCB_RENDER_PICT_OP_EXCLUSION,

-    XCB_RENDER_PICT_OP_HSL_HUE,

-    XCB_RENDER_PICT_OP_HSL_SATURATION,

-    XCB_RENDER_PICT_OP_HSL_COLOR,

-    XCB_RENDER_PICT_OP_HSL_LUMINOSITY

+    XCB_RENDER_PICT_OP_SCREEN = 49,

+    XCB_RENDER_PICT_OP_OVERLAY = 50,

+    XCB_RENDER_PICT_OP_DARKEN = 51,

+    XCB_RENDER_PICT_OP_LIGHTEN = 52,

+    XCB_RENDER_PICT_OP_COLOR_DODGE = 53,

+    XCB_RENDER_PICT_OP_COLOR_BURN = 54,

+    XCB_RENDER_PICT_OP_HARD_LIGHT = 55,

+    XCB_RENDER_PICT_OP_SOFT_LIGHT = 56,

+    XCB_RENDER_PICT_OP_DIFFERENCE = 57,

+    XCB_RENDER_PICT_OP_EXCLUSION = 58,

+    XCB_RENDER_PICT_OP_HSL_HUE = 59,

+    XCB_RENDER_PICT_OP_HSL_SATURATION = 60,

+    XCB_RENDER_PICT_OP_HSL_COLOR = 61,

+    XCB_RENDER_PICT_OP_HSL_LUMINOSITY = 62

 } xcb_render_pict_op_t;

 

 typedef enum xcb_render_poly_edge_t {

-    XCB_RENDER_POLY_EDGE_SHARP,

-    XCB_RENDER_POLY_EDGE_SMOOTH

+    XCB_RENDER_POLY_EDGE_SHARP = 0,

+    XCB_RENDER_POLY_EDGE_SMOOTH = 1

 } xcb_render_poly_edge_t;

 

 typedef enum xcb_render_poly_mode_t {

-    XCB_RENDER_POLY_MODE_PRECISE,

-    XCB_RENDER_POLY_MODE_IMPRECISE

+    XCB_RENDER_POLY_MODE_PRECISE = 0,

+    XCB_RENDER_POLY_MODE_IMPRECISE = 1

 } xcb_render_poly_mode_t;

 

 typedef enum xcb_render_cp_t {

@@ -116,19 +116,19 @@ typedef enum xcb_render_cp_t {
 } xcb_render_cp_t;

 

 typedef enum xcb_render_sub_pixel_t {

-    XCB_RENDER_SUB_PIXEL_UNKNOWN,

-    XCB_RENDER_SUB_PIXEL_HORIZONTAL_RGB,

-    XCB_RENDER_SUB_PIXEL_HORIZONTAL_BGR,

-    XCB_RENDER_SUB_PIXEL_VERTICAL_RGB,

-    XCB_RENDER_SUB_PIXEL_VERTICAL_BGR,

-    XCB_RENDER_SUB_PIXEL_NONE

+    XCB_RENDER_SUB_PIXEL_UNKNOWN = 0,

+    XCB_RENDER_SUB_PIXEL_HORIZONTAL_RGB = 1,

+    XCB_RENDER_SUB_PIXEL_HORIZONTAL_BGR = 2,

+    XCB_RENDER_SUB_PIXEL_VERTICAL_RGB = 3,

+    XCB_RENDER_SUB_PIXEL_VERTICAL_BGR = 4,

+    XCB_RENDER_SUB_PIXEL_NONE = 5

 } xcb_render_sub_pixel_t;

 

 typedef enum xcb_render_repeat_t {

-    XCB_RENDER_REPEAT_NONE,

-    XCB_RENDER_REPEAT_NORMAL,

-    XCB_RENDER_REPEAT_PAD,

-    XCB_RENDER_REPEAT_REFLECT

+    XCB_RENDER_REPEAT_NONE = 0,

+    XCB_RENDER_REPEAT_NORMAL = 1,

+    XCB_RENDER_REPEAT_PAD = 2,

+    XCB_RENDER_REPEAT_REFLECT = 3

 } xcb_render_repeat_t;

 

 typedef uint32_t xcb_render_glyph_t;