From 1625d7a87ae66eb50653d9194e8f9e67b6957c05 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Wed, 1 Apr 2015 10:31:26 -0600 Subject: [PATCH] mesa: don't include colormac.h in format code Acked-by: Matt Turner Reviewed-by: Mark Janes --- src/mesa/main/format_pack.py | 1 - src/mesa/main/format_unpack.h | 2 ++ 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 -#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 -#include "colormac.h" #include "format_unpack.h" #include "format_utils.h" #include "macros.h" -- 2.30.2