Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/mit/xorg/lib/libxcb/files regenerate these for libx...



details:   https://anonhg.NetBSD.org/src/rev/4f7eb19e2b58
branches:  trunk
changeset: 360497:4f7eb19e2b58
user:      mrg <mrg%NetBSD.org@localhost>
date:      Wed Mar 14 06:47:28 2018 +0000

description:
regenerate these for libxcb 1.13.

diffstat:

 external/mit/xorg/lib/libxcb/files/config.h  |    8 +-
 external/mit/xorg/lib/libxcb/files/dri3.c    |  480 ++++++++++++++++++++++++++-
 external/mit/xorg/lib/libxcb/files/dri3.h    |  325 ++++++++++++++++++-
 external/mit/xorg/lib/libxcb/files/present.h |    8 +-
 external/mit/xorg/lib/libxcb/files/randr.c   |  274 ++++++++++++++-
 external/mit/xorg/lib/libxcb/files/randr.h   |  349 ++++++++++++++++---
 external/mit/xorg/lib/libxcb/files/res.c     |    6 +-
 external/mit/xorg/lib/libxcb/files/shm.c     |    6 +-
 external/mit/xorg/lib/libxcb/files/xinput.c  |  410 ++++++++++++----------
 external/mit/xorg/lib/libxcb/files/xinput.h  |  249 +++++++++----
 external/mit/xorg/lib/libxcb/files/xkb.c     |    4 +-
 external/mit/xorg/lib/libxcb/files/xproto.c  |   26 +-
 12 files changed, 1777 insertions(+), 368 deletions(-)

diffs (truncated from 2602 to 300 lines):

diff -r 4f447e7df260 -r 4f7eb19e2b58 external/mit/xorg/lib/libxcb/files/config.h
--- a/external/mit/xorg/lib/libxcb/files/config.h       Wed Mar 14 06:35:31 2018 +0000
+++ b/external/mit/xorg/lib/libxcb/files/config.h       Wed Mar 14 06:47:28 2018 +0000
@@ -77,7 +77,7 @@
 #define PACKAGE_NAME "libxcb"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "libxcb 1.12"
+#define PACKAGE_STRING "libxcb 1.13"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "libxcb"
@@ -86,13 +86,13 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.12"
+#define PACKAGE_VERSION "1.13"
 
 /* Major version of this package */
 #define PACKAGE_VERSION_MAJOR 1
 
 /* Minor version of this package */
-#define PACKAGE_VERSION_MINOR 12
+#define PACKAGE_VERSION_MINOR 13
 
 /* Patch version of this package */
 #define PACKAGE_VERSION_PATCHLEVEL 0
@@ -126,7 +126,7 @@
 
 
 /* Version number of package */
-#define VERSION "1.12"
+#define VERSION "1.13"
 
 /* XCB buffer queue size */
 #define XCB_QUEUE_BUFFER_SIZE 16384
diff -r 4f447e7df260 -r 4f7eb19e2b58 external/mit/xorg/lib/libxcb/files/dri3.c
--- a/external/mit/xorg/lib/libxcb/files/dri3.c Wed Mar 14 06:35:31 2018 +0000
+++ b/external/mit/xorg/lib/libxcb/files/dri3.c Wed Mar 14 06:47:28 2018 +0000
@@ -176,6 +176,7 @@
     xcb_void_cookie_t xcb_ret;
     xcb_dri3_pixmap_from_buffer_request_t xcb_out;
     int fds[1];
+    int fd_index = 0;
 
     xcb_out.pixmap = pixmap;
     xcb_out.drawable = drawable;
@@ -191,7 +192,7 @@
     xcb_parts[3].iov_base = 0;
     xcb_parts[3].iov_len = -xcb_parts[2].iov_len & 3;
 
-    fds[0] = pixmap_fd;
+    fds[fd_index++] = pixmap_fd;
     xcb_ret.sequence = xcb_send_request_with_fds(c, XCB_REQUEST_CHECKED, xcb_parts + 2, &xcb_req, 1, fds);
     return xcb_ret;
 }
@@ -219,6 +220,7 @@
     xcb_void_cookie_t xcb_ret;
     xcb_dri3_pixmap_from_buffer_request_t xcb_out;
     int fds[1];
+    int fd_index = 0;
 
     xcb_out.pixmap = pixmap;
     xcb_out.drawable = drawable;
@@ -234,7 +236,7 @@
     xcb_parts[3].iov_base = 0;
     xcb_parts[3].iov_len = -xcb_parts[2].iov_len & 3;
 
-    fds[0] = pixmap_fd;
+    fds[fd_index++] = pixmap_fd;
     xcb_ret.sequence = xcb_send_request_with_fds(c, 0, xcb_parts + 2, &xcb_req, 1, fds);
     return xcb_ret;
 }
@@ -324,6 +326,7 @@
     xcb_void_cookie_t xcb_ret;
     xcb_dri3_fence_from_fd_request_t xcb_out;
     int fds[1];
+    int fd_index = 0;
 
     xcb_out.drawable = drawable;
     xcb_out.fence = fence;
@@ -335,7 +338,7 @@
     xcb_parts[3].iov_base = 0;
     xcb_parts[3].iov_len = -xcb_parts[2].iov_len & 3;
 
-    fds[0] = fence_fd;
+    fds[fd_index++] = fence_fd;
     xcb_ret.sequence = xcb_send_request_with_fds(c, XCB_REQUEST_CHECKED, xcb_parts + 2, &xcb_req, 1, fds);
     return xcb_ret;
 }
@@ -358,6 +361,7 @@
     xcb_void_cookie_t xcb_ret;
     xcb_dri3_fence_from_fd_request_t xcb_out;
     int fds[1];
+    int fd_index = 0;
 
     xcb_out.drawable = drawable;
     xcb_out.fence = fence;
@@ -369,7 +373,7 @@
     xcb_parts[3].iov_base = 0;
     xcb_parts[3].iov_len = -xcb_parts[2].iov_len & 3;
 
-    fds[0] = fence_fd;
+    fds[fd_index++] = fence_fd;
     xcb_ret.sequence = xcb_send_request_with_fds(c, 0, xcb_parts + 2, &xcb_req, 1, fds);
     return xcb_ret;
 }
@@ -445,3 +449,471 @@
     return xcb_get_reply_fds(c, reply, sizeof(xcb_dri3_fd_from_fence_reply_t) + 4 * reply->length);
 }
 
+int
+xcb_dri3_get_supported_modifiers_sizeof (const void  *_buffer)
+{
+    char *xcb_tmp = (char *)_buffer;
+    const xcb_dri3_get_supported_modifiers_reply_t *_aux = (xcb_dri3_get_supported_modifiers_reply_t *)_buffer;
+    unsigned int xcb_buffer_len = 0;
+    unsigned int xcb_block_len = 0;
+    unsigned int xcb_pad = 0;
+    unsigned int xcb_align_to = 0;
+
+
+    xcb_block_len += sizeof(xcb_dri3_get_supported_modifiers_reply_t);
+    xcb_tmp += xcb_block_len;
+    xcb_buffer_len += xcb_block_len;
+    xcb_block_len = 0;
+    /* window_modifiers */
+    xcb_block_len += _aux->num_window_modifiers * sizeof(uint64_t);
+    xcb_tmp += xcb_block_len;
+    xcb_align_to = ALIGNOF(uint64_t);
+    /* insert padding */
+    xcb_pad = -xcb_block_len & (xcb_align_to - 1);
+    xcb_buffer_len += xcb_block_len + xcb_pad;
+    if (0 != xcb_pad) {
+        xcb_tmp += xcb_pad;
+        xcb_pad = 0;
+    }
+    xcb_block_len = 0;
+    /* screen_modifiers */
+    xcb_block_len += _aux->num_screen_modifiers * sizeof(uint64_t);
+    xcb_tmp += xcb_block_len;
+    xcb_align_to = ALIGNOF(uint64_t);
+    /* insert padding */
+    xcb_pad = -xcb_block_len & (xcb_align_to - 1);
+    xcb_buffer_len += xcb_block_len + xcb_pad;
+    if (0 != xcb_pad) {
+        xcb_tmp += xcb_pad;
+        xcb_pad = 0;
+    }
+    xcb_block_len = 0;
+
+    return xcb_buffer_len;
+}
+
+xcb_dri3_get_supported_modifiers_cookie_t
+xcb_dri3_get_supported_modifiers (xcb_connection_t *c,
+                                  uint32_t          window,
+                                  uint8_t           depth,
+                                  uint8_t           bpp)
+{
+    static const xcb_protocol_request_t xcb_req = {
+        .count = 2,
+        .ext = &xcb_dri3_id,
+        .opcode = XCB_DRI3_GET_SUPPORTED_MODIFIERS,
+        .isvoid = 0
+    };
+
+    struct iovec xcb_parts[4];
+    xcb_dri3_get_supported_modifiers_cookie_t xcb_ret;
+    xcb_dri3_get_supported_modifiers_request_t xcb_out;
+
+    xcb_out.window = window;
+    xcb_out.depth = depth;
+    xcb_out.bpp = bpp;
+    memset(xcb_out.pad0, 0, 2);
+
+    xcb_parts[2].iov_base = (char *) &xcb_out;
+    xcb_parts[2].iov_len = sizeof(xcb_out);
+    xcb_parts[3].iov_base = 0;
+    xcb_parts[3].iov_len = -xcb_parts[2].iov_len & 3;
+
+    xcb_ret.sequence = xcb_send_request(c, XCB_REQUEST_CHECKED, xcb_parts + 2, &xcb_req);
+    return xcb_ret;
+}
+
+xcb_dri3_get_supported_modifiers_cookie_t
+xcb_dri3_get_supported_modifiers_unchecked (xcb_connection_t *c,
+                                            uint32_t          window,
+                                            uint8_t           depth,
+                                            uint8_t           bpp)
+{
+    static const xcb_protocol_request_t xcb_req = {
+        .count = 2,
+        .ext = &xcb_dri3_id,
+        .opcode = XCB_DRI3_GET_SUPPORTED_MODIFIERS,
+        .isvoid = 0
+    };
+
+    struct iovec xcb_parts[4];
+    xcb_dri3_get_supported_modifiers_cookie_t xcb_ret;
+    xcb_dri3_get_supported_modifiers_request_t xcb_out;
+
+    xcb_out.window = window;
+    xcb_out.depth = depth;
+    xcb_out.bpp = bpp;
+    memset(xcb_out.pad0, 0, 2);
+
+    xcb_parts[2].iov_base = (char *) &xcb_out;
+    xcb_parts[2].iov_len = sizeof(xcb_out);
+    xcb_parts[3].iov_base = 0;
+    xcb_parts[3].iov_len = -xcb_parts[2].iov_len & 3;
+
+    xcb_ret.sequence = xcb_send_request(c, 0, xcb_parts + 2, &xcb_req);
+    return xcb_ret;
+}
+
+uint64_t *
+xcb_dri3_get_supported_modifiers_window_modifiers (const xcb_dri3_get_supported_modifiers_reply_t *R)
+{
+    return (uint64_t *) (R + 1);
+}
+
+int
+xcb_dri3_get_supported_modifiers_window_modifiers_length (const xcb_dri3_get_supported_modifiers_reply_t *R)
+{
+    return R->num_window_modifiers;
+}
+
+xcb_generic_iterator_t
+xcb_dri3_get_supported_modifiers_window_modifiers_end (const xcb_dri3_get_supported_modifiers_reply_t *R)
+{
+    xcb_generic_iterator_t i;
+    i.data = ((uint64_t *) (R + 1)) + (R->num_window_modifiers);
+    i.rem = 0;
+    i.index = (char *) i.data - (char *) R;
+    return i;
+}
+
+uint64_t *
+xcb_dri3_get_supported_modifiers_screen_modifiers (const xcb_dri3_get_supported_modifiers_reply_t *R)
+{
+    xcb_generic_iterator_t prev = xcb_dri3_get_supported_modifiers_window_modifiers_end(R);
+    return (uint64_t *) ((char *) prev.data + XCB_TYPE_PAD(uint64_t, prev.index) + 0);
+}
+
+int
+xcb_dri3_get_supported_modifiers_screen_modifiers_length (const xcb_dri3_get_supported_modifiers_reply_t *R)
+{
+    return R->num_screen_modifiers;
+}
+
+xcb_generic_iterator_t
+xcb_dri3_get_supported_modifiers_screen_modifiers_end (const xcb_dri3_get_supported_modifiers_reply_t *R)
+{
+    xcb_generic_iterator_t i;
+    xcb_generic_iterator_t prev = xcb_dri3_get_supported_modifiers_window_modifiers_end(R);
+    i.data = ((uint64_t *) ((char*) prev.data + XCB_TYPE_PAD(uint64_t, prev.index))) + (R->num_screen_modifiers);
+    i.rem = 0;
+    i.index = (char *) i.data - (char *) R;
+    return i;
+}
+
+xcb_dri3_get_supported_modifiers_reply_t *
+xcb_dri3_get_supported_modifiers_reply (xcb_connection_t                           *c,
+                                        xcb_dri3_get_supported_modifiers_cookie_t   cookie  /**< */,
+                                        xcb_generic_error_t                       **e)
+{
+    return (xcb_dri3_get_supported_modifiers_reply_t *) xcb_wait_for_reply(c, cookie.sequence, e);
+}
+
+xcb_void_cookie_t
+xcb_dri3_pixmap_from_buffers_checked (xcb_connection_t *c,
+                                      xcb_pixmap_t      pixmap,
+                                      xcb_window_t      window,
+                                      uint8_t           num_buffers,
+                                      uint16_t          width,
+                                      uint16_t          height,
+                                      uint32_t          stride0,
+                                      uint32_t          offset0,
+                                      uint32_t          stride1,
+                                      uint32_t          offset1,
+                                      uint32_t          stride2,
+                                      uint32_t          offset2,
+                                      uint32_t          stride3,
+                                      uint32_t          offset3,
+                                      uint8_t           depth,
+                                      uint8_t           bpp,
+                                      uint64_t          modifier,
+                                      const int32_t    *buffers)
+{
+    static const xcb_protocol_request_t xcb_req = {
+        .count = 2,
+        .ext = &xcb_dri3_id,
+        .opcode = XCB_DRI3_PIXMAP_FROM_BUFFERS,
+        .isvoid = 1
+    };
+
+    struct iovec xcb_parts[4];
+    xcb_void_cookie_t xcb_ret;



Home | Main Index | Thread Index | Old Index