Revert "i965/fs: Change fs_visitor::emit_lrp to use MAC for gen<6"

[mesa.git] / src / glx / dri3_priv.h

diff --git a/src/glx/dri3_priv.h b/src/glx/dri3_priv.h
index eb81ce7bdb1558592cc4e2c881113ae9234e0e83..689488641a11b87383b0c9e53fe9a7b90b857005 100644 (file)
--- a/src/glx/dri3_priv.h
+++ b/src/glx/dri3_priv.h
@@ -97,6 +97,7 @@ struct dri3_buffer {
    uint32_t     cpp;
    uint32_t     flags;
    uint32_t     width, height;
+   uint64_t     last_swap;
 
    enum dri3_buffer_type        buffer_type;
 };
@@ -105,7 +106,7 @@ struct dri3_display
 {
    __GLXDRIdisplay base;
 
-   const __DRIextension *loader_extensions[8];
+   const __DRIextension **loader_extensions;
 
    /* DRI3 bits */
    int dri3Major;
@@ -129,6 +130,7 @@ struct dri3_screen {
    const __DRI2flushExtension *f;
    const __DRI2configQueryExtension *config;
    const __DRItexBufferExtension *texBuffer;
+   const __DRI2rendererQueryExtension *rendererQuery;
    const __DRIconfig **driver_configs;
 
    void *driver;
@@ -143,26 +145,10 @@ struct dri3_context
    __DRIcontext *driContext;
 };
 
-#define DRI3_MAX_BACK   2
+#define DRI3_MAX_BACK   3
 #define DRI3_BACK_ID(i) (i)
 #define DRI3_FRONT_ID   (DRI3_MAX_BACK)
 
-static inline int
-dri3_buf_id_next(int buf_id)
-{
-   if (buf_id == DRI3_MAX_BACK - 1)
-      return 0;
-   return buf_id + 1;
-}
-
-static inline int
-dri3_buf_id_prev(int buf_id)
-{
-   if (buf_id == 0)
-      return DRI3_MAX_BACK - 1;
-   return buf_id - 1;
-}
-
 static inline int
 dri3_pixmap_buf_id(enum dri3_buffer_type buffer_type)
 {
@@ -177,29 +163,29 @@ dri3_pixmap_buf_id(enum dri3_buffer_type buffer_type)
 struct dri3_drawable {
    __GLXDRIdrawable base;
    __DRIdrawable *driDrawable;
-   int width, height;
+   int width, height, depth;
    int swap_interval;
    uint8_t have_back;
    uint8_t have_fake_front;
    uint8_t is_pixmap;
+   uint8_t flipping;
 
-   uint32_t present_request_serial;
-   uint32_t present_event_serial;
-
-   uint64_t sbc;
+   /* SBC numbers are tracked by using the serial numbers
+    * in the present request and complete events
+    */
+   uint64_t send_sbc;
+   uint64_t recv_sbc;
 
+   /* Last received UST/MSC values */
    uint64_t ust, msc;
 
-   /* For WaitMSC */
-   uint32_t present_msc_request_serial;
-   uint32_t present_msc_event_serial;
-   
-   uint64_t previous_time;
-   unsigned frames;
+   /* Serial numbers for tracking wait_for_msc events */
+   uint32_t send_msc_serial;
+   uint32_t recv_msc_serial;
 
    struct dri3_buffer *buffers[DRI3_NUM_BUFFERS];
    int cur_back;
-   int depth;
+   int num_back;
 
    uint32_t *stamp;
 
@@ -207,6 +193,3 @@ struct dri3_drawable {
    xcb_gcontext_t gc;
    xcb_special_event_t *special_event;
 };
-
-char *
-dri3_get_driver_for_fd(int fd);