From: Brian Paul <brianp@vmware.com>
Date: Wed, 1 Apr 2015 16:31:26 +0000 (-0600)
Subject: mesa: don't include colormac.h in format code
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1625d7a87ae66eb50653d9194e8f9e67b6957c05;p=mesa.git

mesa: don't include colormac.h in format code

Acked-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Mark Janes <mark.a.janes@intel.com>
---

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"