diff options
| author | Eric Anholt <[email protected]> | 2010-07-26 17:47:59 -0700 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2010-07-26 17:53:27 -0700 |
| commit | afe125e0a18ac3886c45c7e6b02b122fb2d327b5 (patch) | |
| tree | 78621707e71154c0b388b0baacffc26432b7e992 /src/mesa/main/image.h | |
| parent | d64343f1ae84979bd154475badf11af8a9bfc2eb (diff) | |
| parent | 5403ca79b225605c79f49866a6497c97da53be3b (diff) | |
Merge remote branch 'origin/master' into glsl2
This pulls in multiple i965 driver fixes which will help ensure better
testing coverage during development, and also gets past the conflicts
of the src/mesa/shader -> src/mesa/program move.
Conflicts:
src/mesa/Makefile
src/mesa/main/shaderapi.c
src/mesa/main/shaderobj.h
Diffstat (limited to 'src/mesa/main/image.h')
| -rw-r--r-- | src/mesa/main/image.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/mesa/main/image.h b/src/mesa/main/image.h index 48582eb3bbe..8b180d6bfe6 100644 --- a/src/mesa/main/image.h +++ b/src/mesa/main/image.h @@ -79,6 +79,9 @@ extern GLboolean _mesa_is_dudv_format(GLenum format); extern GLboolean +_mesa_is_integer_format(GLenum format); + +extern GLboolean _mesa_is_compressed_format(GLcontext *ctx, GLenum format); extern GLvoid * |