upgrade for xorg-server 1.12.99.905 (for 1.13 RC)

Change-Id: Id8dff22eb232534b1d79d2b00f8bac0e11fc3e03

diff --git a/configure.ac b/configure.ac
index d671f5a..6d1ebdb 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.60])
-AC_INIT([DRI2Proto], [2.6], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([DRI2Proto], [2.8], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 

diff --git a/dri2proto.h b/dri2proto.h
index cd82afb..128b807 100755 (executable)
--- a/dri2proto.h
+++ b/dri2proto.h
@@ -35,11 +35,11 @@
 
 #define DRI2_NAME                      "DRI2"
 #define DRI2_MAJOR                     1
-#define DRI2_MINOR                     3
+#define DRI2_MINOR                     4
 
 #define DRI2NumberErrors               0
 #define DRI2NumberEvents               2
-#define DRI2NumberRequests             13
+#define DRI2NumberRequests             14
 
 #define X_DRI2QueryVersion             0
 #define X_DRI2Connect                  1
@@ -54,6 +54,7 @@
 #define X_DRI2WaitMSC                  10
 #define X_DRI2WaitSBC                  11
 #define X_DRI2SwapInterval             12
+#define X_DRI2GetParam                 13
 
 /*
  * Events
@@ -330,4 +331,27 @@ typedef struct {
 } xDRI2InvalidateBuffers;
 #define sz_xDRI2InvalidateBuffers 32
 
+typedef struct {
+    CARD8   reqType;
+    CARD8   dri2ReqType;
+    CARD16  length B16;
+    CARD32  drawable B32;
+    CARD32  param B32;
+} xDRI2GetParamReq;
+#define sz_xDRI2GetParamReq 12
+
+typedef struct {
+    BYTE    type; /*X_Reply*/
+    BOOL    is_param_recognized;
+    CARD16  sequenceNumber B16;
+    CARD32  length B32;
+    CARD32  value_hi B32;
+    CARD32  value_lo B32;
+    CARD32  pad1 B32;
+    CARD32  pad2 B32;
+    CARD32  pad3 B32;
+    CARD32  pad4 B32;
+} xDRI2GetParamReply;
+#define sz_xDRI2GetParamReply 32
+
 #endif

diff --git a/dri2proto.txt b/dri2proto.txt
old mode 100755 (executable)
new mode 100644 (file)
index df763c7..9921301
--- a/dri2proto.txt
+++ b/dri2proto.txt
@@ -440,6 +440,36 @@ The name of this extension is "DRI2".
        DRI2SwapBuffers requests to swap at most once per interval frames,
        which is useful useful for limiting the frame rate.
 
+┌───
+    DRI2GetParam
+       drawable: DRAWABLE
+       param: CARD32
+      ▶
+       is_param_recognized: BOOL
+       value: CARD64
+└───
+       Errors: Drawable
+
+       Get the value of a parameter.  The parameter's value is looked up on
+       the screen associated with 'drawable'.
+
+       Parameter names in which the value of the most significant byte is
+       0 are reserved for the X server. Currently, no such parameter names
+       are defined. (When any such names are defined, they will be defined in
+       this extension specification and its associated headers).
+
+       Parameter names in which the byte's value is 1 are reserved for the
+       DDX. Such names are private to each driver and shall be defined in the
+       respective driver's headers.
+
+       Parameter names in which the byte's value is neither 0 nor 1 are
+       reserved for future use.
+
+       Possible values of 'is_param_recognized' are true (1) and false (0).
+       If false, then 'value' is undefined.
+
+       This request is only available with protocol version 1.4 or later.
+
                             ⚙ ⚙ ⚙  ⚙ ⚙ ⚙
 
 9. Extension Events
@@ -512,6 +542,8 @@ The DRI2 extension has undergone a number of revisions before
 
        2.6: Enlightenment attained.  Added the DRI2BufferHiz attachment.
 
+       2.7: Added the DRI2GetParam request.
+
 Compatibility up to 2.0 is not preserved, but was also never released.
 
 
@@ -658,7 +690,7 @@ A.2 Protocol Requests
 ┌───
     DRI2GetBuffers
        1       CARD8                   major opcode
-       1       3                       DRI2 opcode
+       1       5                       DRI2 opcode
        2       3                       length
        4       DRAWABLE                drawable
        4       n                       number of attachments
@@ -678,7 +710,7 @@ A.2 Protocol Requests
 ┌───
     DRI2CopyRegion
        1       CARD8                   major opcode
-       1       4                       DRI2 opcode
+       1       6                       DRI2 opcode
        2       3                       length
        4       DRAWABLE                drawable
        4       REGION                  region
@@ -695,7 +727,7 @@ A.2 Protocol Requests
 ┌───
     DRI2GetBuffersWithFormat
        1       CARD8                   major opcode
-       1       3                       DRI2 opcode
+       1       7                       DRI2 opcode
        2       3                       length
        4       DRAWABLE                drawable
        4       n                       number of attachments
@@ -715,7 +747,7 @@ A.2 Protocol Requests
 ┌───
     DRI2SwapBuffers
        1       CARD8                   major opcode
-       1       7                       DRI2 opcode
+       1       8                       DRI2 opcode
        2       8                       length
        4       DRAWABLE                drawable
       ▶      
@@ -736,7 +768,7 @@ A.2 Protocol Requests
 ┌───
     DRI2SwapBuffers
        1       CARD8                   major opcode
-       1       7                       DRI2 opcode
+       1       8                       DRI2 opcode
        2       8                       length
        4       DRAWABLE                drawable
        4       CARD32                  target_msc_hi
@@ -758,7 +790,7 @@ A.2 Protocol Requests
 ┌───
     DRI2GetMSC
        1       CARD8                   major opcode
-       1       7                       DRI2 opcode
+       1       9                       DRI2 opcode
        2       8                       length
        4       DRAWABLE                drawable
       ▶
@@ -777,7 +809,7 @@ A.2 Protocol Requests
 ┌───
     DRI2WaitMSC
        1       CARD8                   major opcode
-       1       7                       DRI2 opcode
+       1       10                      DRI2 opcode
        2       8                       length
        4       DRAWABLE                drawable
        4       CARD32                  target_msc_hi
@@ -802,7 +834,7 @@ A.2 Protocol Requests
 ┌───
     DRI2WaitSBC
        1       CARD8                   major opcode
-       1       7                       DRI2 opcode
+       1       11                      DRI2 opcode
        2       8                       length
        4       DRAWABLE                drawable
        4       CARD32                  swap_hi
@@ -823,13 +855,30 @@ A.2 Protocol Requests
 ┌───
     DRI2SwapInterval
        1       CARD8                   major opcode
-       1       7                       DRI2 opcode
+       1       12                      DRI2 opcode
        2       8                       length
        4       DRAWABLE                drawable
        4       CARD32                  interval
      ▶
 └───
 
+┌───
+    DRI2GetParam
+       1       CARD8                   major opcode
+       1       13                      DRI2 opcode
+       2       8                       length
+       4       DRAWABLE                drawable
+       4       CARD32                  param
+     ▶
+       1       1                       Reply
+       1       BOOL                    is_param_recognized
+       2       CARD16                  sequence number
+       4       0                       reply length
+       4       CARD32                  value_hi
+       4       CARD32                  value_lo
+       16                              unused
+└───
+
 A.3 Protocol Events
 
 The DRI2 extension specifies DRI2_BufferSwapComplete and

diff --git a/dri2tokens.h b/dri2tokens.h
old mode 100755 (executable)
new mode 100644 (file)
index 16c9008..bdca866
--- a/dri2tokens.h
+++ b/dri2tokens.h
@@ -45,6 +45,11 @@
 #define DRI2BufferDepthStencil         9
 #define DRI2BufferHiz                  10
 
+/* keep bits 16 and above for prime IDs */
+#define DRI2DriverPrimeMask             7 /* 0 - 7 - allows for 6 devices*/
+#define DRI2DriverPrimeShift           16
+#define DRI2DriverPrimeId(x)         (((x) >> DRI2DriverPrimeShift) & (DRI2DriverPrimeMask))
+
 #define DRI2DriverDRI                  0
 #define DRI2DriverVDPAU                        1
 

diff --git a/packaging/xorg-x11-proto-dri2.spec b/packaging/xorg-x11-proto-dri2.spec
index 0606a1c..56cb1fe 100644 (file)
--- a/packaging/xorg-x11-proto-dri2.spec
+++ b/packaging/xorg-x11-proto-dri2.spec
@@ -1,6 +1,6 @@
 Name:     xorg-x11-proto-dri2
 Summary:  X.Org X11 Protocol dri2proto
-Version:  2.6
+Version:  2.8
 Release:  1
 Group:    Development/System
 License:  MIT
@@ -42,4 +42,4 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %{_includedir}/X11/extensions/*.h
-%{_datadir}/pkgconfig/*.pc
\ No newline at end of file
+%{_datadir}/pkgconfig/*.pc