diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-05-25 14:19:18 +1000 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-05-25 14:19:18 +1000 |
| commit | 92120851947ad4a47d2150a7cf3f8dc5fdde396c (patch) | |
| tree | 21a04cf25570028ee0266558a1350577751722ab /src/gallium/winsys/dri/intel/intel_winsys.h | |
| parent | 9a01ee4424718e0c3015c1f0477cae63ee63d96b (diff) | |
| parent | 7fbb61eedd4b07f07007a172cea227d5c363b908 (diff) | |
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Diffstat (limited to 'src/gallium/winsys/dri/intel/intel_winsys.h')
| -rw-r--r-- | src/gallium/winsys/dri/intel/intel_winsys.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/winsys/dri/intel/intel_winsys.h b/src/gallium/winsys/dri/intel/intel_winsys.h index ffc40782be..3d32db10a4 100644 --- a/src/gallium/winsys/dri/intel/intel_winsys.h +++ b/src/gallium/winsys/dri/intel/intel_winsys.h @@ -37,7 +37,7 @@ struct pipe_buffer; struct _DriBufferObject; struct pipe_winsys * -intel_create_pipe_winsys( int fd ); +intel_create_pipe_winsys( int fd, struct _DriFreeSlabManager *fMan ); void intel_destroy_pipe_winsys( struct pipe_winsys *winsys ); @@ -53,6 +53,7 @@ intel_create_i915simple( struct intel_context *intel, struct intel_buffer { struct pipe_buffer base; + struct _DriBufferPool *pool; struct _DriBufferObject *driBO; }; @@ -69,5 +70,4 @@ dri_bo( struct pipe_buffer *buf ) } - #endif |