diff options
| author | Dan Nicholson <dbn.lists@gmail.com> | 2007-12-12 21:24:06 -0800 |
|---|---|---|
| committer | Dan Nicholson <dbn.lists@gmail.com> | 2007-12-12 21:24:06 -0800 |
| commit | f116634933cf19fe2a52a3be4e106be643cb1d0b (patch) | |
| tree | adfd449684b4aafb1abdda9d3795d637002fc847 /src/mesa/drivers/dri/i965/intel_ioctl.h | |
| parent | c79c93c0acd184e0333c1c9cedfbce11381e66e2 (diff) | |
| parent | 37406c2038c418a1d6f26b5ac5691586c9f05631 (diff) | |
Merge branch 'master' into autoconf2
Diffstat (limited to 'src/mesa/drivers/dri/i965/intel_ioctl.h')
| -rw-r--r-- | src/mesa/drivers/dri/i965/intel_ioctl.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_ioctl.h b/src/mesa/drivers/dri/i965/intel_ioctl.h index df27659362..8674aef723 100644 --- a/src/mesa/drivers/dri/i965/intel_ioctl.h +++ b/src/mesa/drivers/dri/i965/intel_ioctl.h @@ -35,10 +35,12 @@ int intelEmitIrqLocked( struct intel_context *intel ); void intel_batch_ioctl( struct intel_context *intel, GLuint start_offset, - GLuint used); - -void intel_cmd_ioctl( struct intel_context *intel, - char *buf, - GLuint used); + GLuint used, + GLboolean ignore_cliprects, + GLboolean allow_unlock ); +void intel_exec_ioctl(struct intel_context *intel, + GLuint used, + GLboolean ignore_cliprects, GLboolean allow_unlock, + void *start, GLuint count, dri_fence **fence); #endif |