diff options
| author | Michel Dänzer <daenzer@vmware.com> | 2009-06-19 23:55:55 +0200 |
|---|---|---|
| committer | Michel Dänzer <daenzer@vmware.com> | 2009-06-19 23:55:55 +0200 |
| commit | dd26899ca39111e0866afed9df94bfb1618dd363 (patch) | |
| tree | ab67e12cd04d660bc554cc91e76b5bcdee788ea6 /src/mesa/drivers/dri/intel/intel_buffer_objects.h | |
| parent | 4d2b392a0ac597f8b7f88006746660e8f0fe09ea (diff) | |
intel: Fixups for 'mesa: create/destroy buffer objects via driver functions'.
Initialize all driver function hooks before calling _mesa_initialize_context(),
and handle all buffer objects in intel_buffer_object().
Fixes assertion failure when running glxinfo.
Diffstat (limited to 'src/mesa/drivers/dri/intel/intel_buffer_objects.h')
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_buffer_objects.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_buffer_objects.h b/src/mesa/drivers/dri/intel/intel_buffer_objects.h index 0431015631..8164407f07 100644 --- a/src/mesa/drivers/dri/intel/intel_buffer_objects.h +++ b/src/mesa/drivers/dri/intel/intel_buffer_objects.h @@ -60,7 +60,7 @@ dri_bo *intel_bufferobj_buffer(struct intel_context *intel, /* Hook the bufferobject implementation into mesa: */ -void intel_bufferobj_init(struct intel_context *intel); +void intelInitBufferObjectFuncs(struct dd_function_table *functions); @@ -72,10 +72,7 @@ void intel_bufferobj_init(struct intel_context *intel); 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: |