diff options
author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2010-01-11 15:23:29 -0500 |
---|---|---|
committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2010-01-11 15:23:29 -0500 |
commit | c6ef705e414c8e93ee471f50d15ada3492a9b067 (patch) | |
tree | 5b037def16eaa6e58860f7b66d79fd75067a0cb2 /src/mesa/drivers/dri/intel/intel_context.h | |
parent | cca66dbb59673168d57b4e3499ccc31f4ddc86ad (diff) | |
parent | 7c50d29f7ced3d60e52ee0146d982b49ea421de2 (diff) |
Merge branch 'master' of ssh://people.freedesktop.org/~jbarnes/mesa
Conflicts due to DRI1 removal:
src/mesa/drivers/dri/intel/intel_context.c
src/mesa/drivers/dri/intel/intel_screen.c
Diffstat (limited to 'src/mesa/drivers/dri/intel/intel_context.h')
-rw-r--r-- | src/mesa/drivers/dri/intel/intel_context.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_context.h b/src/mesa/drivers/dri/intel/intel_context.h index c7b7235836..07207bfbec 100644 --- a/src/mesa/drivers/dri/intel/intel_context.h +++ b/src/mesa/drivers/dri/intel/intel_context.h @@ -412,6 +412,7 @@ extern GLboolean intelInitContext(struct intel_context *intel, extern void intelFinish(GLcontext * ctx); extern void intelFlush(GLcontext * ctx); +extern void intel_flush(GLcontext * ctx, GLboolean needs_mi_flush); extern void intelInitDriverFunctions(struct dd_function_table *functions); |