projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
intel: Throttle after doing copyregion/swapbuffers round trip
[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 7ef723833c0481ef43cde99414b0f59fa04db493..bf3e08a320187236b036482377bc449870fecabc 100644
(file)
--- a/
src/mesa/drivers/dri/intel/intel_buffer_objects.h
+++ b/
src/mesa/drivers/dri/intel/intel_buffer_objects.h
@@
-42,10
+42,18
@@
struct intel_buffer_object
{
struct gl_buffer_object Base;
dri_bo *buffer; /* the low-level buffer manager's buffer handle */
{
struct gl_buffer_object Base;
dri_bo *buffer; /* the low-level buffer manager's buffer handle */
+ /** 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? */
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 mapped_gtt;
};
@@
-58,7
+66,7
@@
dri_bo *intel_bufferobj_buffer(struct intel_context *intel,
/* Hook the bufferobject implementation into mesa:
*/
/* Hook the bufferobject implementation into mesa:
*/
-void intel
_bufferobj_init(struct intel_context *intel
);
+void intel
InitBufferObjectFuncs(struct dd_function_table *functions
);
@@
-70,10
+78,7
@@
void intel_bufferobj_init(struct intel_context *intel);
static INLINE struct intel_buffer_object *
intel_buffer_object(struct gl_buffer_object *obj)
{
static INLINE struct intel_buffer_object *
intel_buffer_object(struct gl_buffer_object *obj)
{
- if (obj->Name)
- return (struct intel_buffer_object *) obj;
- else
- return NULL;
+ return (struct intel_buffer_object *) obj;
}
/* Helpers for zerocopy image uploads. See also intel_regions.h:
}
/* Helpers for zerocopy image uploads. See also intel_regions.h: