diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2010-12-21 06:30:39 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2010-12-21 06:30:39 +1000 |
| commit | e52ebd6e8587e2e37ed65ad9fc9035c2bd00b563 (patch) | |
| tree | 8dc271c2fdc6ceda6b329762d234c88e0fdffe2e /src/mesa/state_tracker/st_cb_readpixels.h | |
| parent | 9f2cf899578464a7448d7abec681bde42eb3d2f2 (diff) | |
| parent | 5c102dd94f435e97507213fbd128e50dd15f5f54 (diff) | |
Merge remote branch 'origin/master' into nvc0-new
Conflicts:
src/gallium/drivers/nouveau/nouveau_winsys.h
Diffstat (limited to 'src/mesa/state_tracker/st_cb_readpixels.h')
| -rw-r--r-- | src/mesa/state_tracker/st_cb_readpixels.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mesa/state_tracker/st_cb_readpixels.h b/src/mesa/state_tracker/st_cb_readpixels.h index 83c9b659e3..9622ae6fee 100644 --- a/src/mesa/state_tracker/st_cb_readpixels.h +++ b/src/mesa/state_tracker/st_cb_readpixels.h @@ -29,9 +29,11 @@ #ifndef ST_CB_READPIXELS_H #define ST_CB_READPIXELS_H -#include "main/mtypes.h" +#include "main/glheader.h" struct dd_function_table; +struct gl_context; +struct gl_pixelstore_attrib; extern struct st_renderbuffer * st_get_color_read_renderbuffer(struct gl_context *ctx); |