diff options
| author | Christian König <[email protected]> | 2010-12-11 13:43:44 +0100 |
|---|---|---|
| committer | Christian König <[email protected]> | 2010-12-11 13:43:44 +0100 |
| commit | 772b25e1f366edc857e77b8c1ccdc5297d82cc41 (patch) | |
| tree | 88d38b52e80319dbd4a0c5b5e038d92f1105110a /src/mesa/main/syncobj.h | |
| parent | ab130400cf91ab471e265e58193c95f04c7aeeda (diff) | |
| parent | b3d2ec9942303d1d03e28a25b030eb060415abfb (diff) | |
Merge remote branch 'origin/master' into pipe-video
Conflicts:
src/gallium/drivers/r600/r600_pipe.c
src/gallium/drivers/r600/r600_texture.c
Diffstat (limited to 'src/mesa/main/syncobj.h')
| -rw-r--r-- | src/mesa/main/syncobj.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/mesa/main/syncobj.h b/src/mesa/main/syncobj.h index f3c0046cf3d..51de9bf4809 100644 --- a/src/mesa/main/syncobj.h +++ b/src/mesa/main/syncobj.h @@ -31,9 +31,13 @@ #ifndef SYNCOBJ_H #define SYNCOBJ_H -#include "main/mtypes.h" +#include "glheader.h" +#include "mfeatures.h" +struct _glapi_table; struct dd_function_table; +struct gl_context; +struct gl_sync_object; #if FEATURE_ARB_sync |