diff options
| author | Keith Whitwell <keithw@vmware.com> | 2009-02-16 19:50:48 +0000 |
|---|---|---|
| committer | Keith Whitwell <keithw@vmware.com> | 2009-02-16 19:50:48 +0000 |
| commit | 59d54334c96f44ed1d8bf660dc96221362a77d04 (patch) | |
| tree | e9ab34e568256bcdc2a88602c47072ab769211e8 /src/mesa/drivers/dri/intel/intel_pixel.h | |
| parent | 7c8836e9ef49d938aa55a1c385b95c6371c301f1 (diff) | |
| parent | c5c383596ddb26cd75e4b355918ad16915283b59 (diff) | |
Merge branch 'master' into gallium-texture-transfer
Conflicts:
src/mesa/state_tracker/st_cb_accum.c
src/mesa/state_tracker/st_cb_drawpixels.c
Diffstat (limited to 'src/mesa/drivers/dri/intel/intel_pixel.h')
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_pixel.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_pixel.h b/src/mesa/drivers/dri/intel/intel_pixel.h index 76b8781316..cb41fa182c 100644 --- a/src/mesa/drivers/dri/intel/intel_pixel.h +++ b/src/mesa/drivers/dri/intel/intel_pixel.h @@ -76,4 +76,6 @@ void intelBitmap(GLcontext * ctx, const struct gl_pixelstore_attrib *unpack, const GLubyte * pixels); +void intel_clear_tris(GLcontext *ctx, GLbitfield mask); + #endif |