diff options
| author | Jakob Bornecrantz <jakob@tungstengraphics.com> | 2008-05-26 13:04:25 +0200 |
|---|---|---|
| committer | Jakob Bornecrantz <jakob@tungstengraphics.com> | 2008-05-26 13:04:25 +0200 |
| commit | e3ddafd1d32192f4638d4930627ad66624325561 (patch) | |
| tree | d538b76af6c559593c6507ad7c2eb415d1b28c75 /src/gallium/winsys/dri/intel/intel_winsys.h | |
| parent | 359058e7b77ddbac5eec7e8d1c77232bcbb1adbf (diff) | |
| parent | 7fbb61eedd4b07f07007a172cea227d5c363b908 (diff) | |
Merge branch 'gallium-tex-surface' into gallium-0.1
Conflicts:
src/gallium/include/pipe/p_util.h
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 |