diff options
| author | Brian Paul <[email protected]> | 2015-04-01 10:31:26 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2015-04-01 12:04:28 -0600 |
| commit | 1625d7a87ae66eb50653d9194e8f9e67b6957c05 (patch) | |
| tree | 67a0eb44acb29ee9c38816b55885a457832a94d8 | |
| parent | 2768a0b1b42f3c1531ab9c3647a93f0504002280 (diff) | |
mesa: don't include colormac.h in format code
Acked-by: Matt Turner <[email protected]>
Reviewed-by: Mark Janes <[email protected]>
| -rw-r--r-- | src/mesa/main/format_pack.py | 1 | ||||
| -rw-r--r-- | src/mesa/main/format_unpack.h | 2 | ||||
| -rw-r--r-- | src/mesa/main/format_unpack.py | 1 |
3 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/main/format_pack.py b/src/mesa/main/format_pack.py index f141da83ca4..2f43a30ddd8 100644 --- a/src/mesa/main/format_pack.py +++ b/src/mesa/main/format_pack.py @@ -43,7 +43,6 @@ string = """/* #include <stdint.h> -#include "colormac.h" #include "format_pack.h" #include "format_utils.h" #include "macros.h" diff --git a/src/mesa/main/format_unpack.h b/src/mesa/main/format_unpack.h index eba3c665070..964c6077af2 100644 --- a/src/mesa/main/format_unpack.h +++ b/src/mesa/main/format_unpack.h @@ -25,6 +25,8 @@ #ifndef FORMAT_UNPACK_H #define FORMAT_UNPACK_H +#include "formats.h" + extern void _mesa_unpack_rgba_row(mesa_format format, GLuint n, const void *src, GLfloat dst[][4]); diff --git a/src/mesa/main/format_unpack.py b/src/mesa/main/format_unpack.py index 53bdf641d12..5928c2018eb 100644 --- a/src/mesa/main/format_unpack.py +++ b/src/mesa/main/format_unpack.py @@ -43,7 +43,6 @@ string = """/* #include <stdint.h> -#include "colormac.h" #include "format_unpack.h" #include "format_utils.h" #include "macros.h" |