i915: reference __DRI_ATTRIB_SWAP_COPY token over the GLX one

[mesa.git] / src / mesa / drivers / dri / i915 / intel_buffer_objects.h

diff --git a/src/mesa/drivers/dri/i915/intel_buffer_objects.h b/src/mesa/drivers/dri/i915/intel_buffer_objects.h
index 5cf66c56a46904be995445ae2a43cb8cbce376bd..9ebfe4844e7948ca723e27df606622543201094b 100644 (file)
--- a/src/mesa/drivers/dri/i915/intel_buffer_objects.h
+++ b/src/mesa/drivers/dri/i915/intel_buffer_objects.h
@@ -46,10 +46,8 @@ struct intel_buffer_object
    /** System memory buffer data, if not using a BO to store the data. */
    void *sys_buffer;
 
-   drm_intel_bo *range_map_bo;
-   void *range_map_buffer;
-   unsigned int range_map_offset;
-   GLsizei range_map_size;
+   drm_intel_bo *range_map_bo[MAP_COUNT];
+   void *range_map_buffer[MAP_COUNT];
 
    bool source;
 };
@@ -58,8 +56,7 @@ struct intel_buffer_object
 /* Get the bm buffer associated with a GL bufferobject:
  */
 drm_intel_bo *intel_bufferobj_buffer(struct intel_context *intel,
-                                    struct intel_buffer_object *obj,
-                                    GLuint flag);
+                                    struct intel_buffer_object *obj);
 drm_intel_bo *intel_bufferobj_source(struct intel_context *intel,
                                     struct intel_buffer_object *obj,
                                     GLuint align,