intel: Remove dead code in intelAllocateBuffer

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

diff --git a/src/mesa/drivers/dri/intel/intel_buffer_objects.h b/src/mesa/drivers/dri/intel/intel_buffer_objects.h
index 2d86becdf3e72d4eef3b1d835023848710671792..92a4121ce501e3dbe8d7b57129d4b78f85801d5e 100644 (file)
--- a/src/mesa/drivers/dri/intel/intel_buffer_objects.h
+++ b/src/mesa/drivers/dri/intel/intel_buffer_objects.h
@@ -31,7 +31,6 @@
 #include "main/mtypes.h"
 
 struct intel_context;
-struct intel_region;
 struct gl_buffer_object;
 
 
@@ -47,17 +46,12 @@ struct intel_buffer_object
    /** System memory buffer data, if not using a BO to store the data. */
    void *sys_buffer;
 
-   struct intel_region *region; /* Is there a zero-copy texture
-                                   associated with this (pixel)
-                                   buffer object? */
-
    drm_intel_bo *range_map_bo;
    void *range_map_buffer;
    unsigned int range_map_offset;
    GLsizei range_map_size;
 
-   GLboolean mapped_gtt;
-   GLboolean source;
+   bool source;
 };
 
 
@@ -68,17 +62,18 @@ drm_intel_bo *intel_bufferobj_buffer(struct intel_context *intel,
                                     GLuint flag);
 drm_intel_bo *intel_bufferobj_source(struct intel_context *intel,
                                     struct intel_buffer_object *obj,
+                                    GLuint align,
                                     GLuint *offset);
 
 void intel_upload_data(struct intel_context *intel,
-                      const void *ptr, GLuint size,
+                      const void *ptr, GLuint size, GLuint align,
                       drm_intel_bo **return_bo,
                       GLuint *return_offset);
 
 void *intel_upload_map(struct intel_context *intel,
-                      GLuint size);
+                      GLuint size, GLuint align);
 void intel_upload_unmap(struct intel_context *intel,
-                       const void *ptr, GLuint size,
+                       const void *ptr, GLuint size, GLuint align,
                        drm_intel_bo **return_bo,
                        GLuint *return_offset);
 
@@ -88,25 +83,10 @@ void intel_upload_finish(struct intel_context *intel);
  */
 void intelInitBufferObjectFuncs(struct dd_function_table *functions);
 
-
-
-/* Are the obj->Name tests necessary?  Unfortunately yes, mesa
- * allocates a couple of gl_buffer_object structs statically, and
- * the Name == 0 test is the only way to identify them and avoid
- * casting them erroneously to our structs.
- */
-static INLINE struct intel_buffer_object *
+static inline struct intel_buffer_object *
 intel_buffer_object(struct gl_buffer_object *obj)
 {
    return (struct intel_buffer_object *) obj;
 }
 
-/* Helpers for zerocopy image uploads.  See also intel_regions.h:
- */
-void intel_bufferobj_cow(struct intel_context *intel,
-                         struct intel_buffer_object *intel_obj);
-void intel_bufferobj_release_region(struct intel_context *intel,
-                                    struct intel_buffer_object *intel_obj);
-
-
 #endif