gamma: s#colormac.h#main/colormac.h#

diff --git a/src/mesa/drivers/dri/gamma/gamma_context.h b/src/mesa/drivers/dri/gamma/gamma_context.h
index c386aa3007a3394f73e8e3b6ce94c30c78aacf0e..f702eee945d21527c7d71ce2cb4da606a53f0a92 100644 (file)
--- a/src/mesa/drivers/dri/gamma/gamma_context.h
+++ b/src/mesa/drivers/dri/gamma/gamma_context.h
@@ -29,7 +29,7 @@
 #include "dri_util.h"
 #include "drm.h"
 #include "drm_sarea.h"
-#include "colormac.h"
+#include "main/colormac.h"
 #include "gamma_regs.h"
 #include "gamma_main/macros.h"
 #include "gamma_screen.h"

diff --git a/src/mesa/drivers/dri/gamma/gamma_span.c b/src/mesa/drivers/dri/gamma/gamma_span.c
index 7376ecf8e41d1aa28708193d10a1a0653e0c68a4..b96e49eadcf4c14ef78107fd6ec2f2244b9707c1 100644 (file)
--- a/src/mesa/drivers/dri/gamma/gamma_span.c
+++ b/src/mesa/drivers/dri/gamma/gamma_span.c
@@ -1,7 +1,7 @@
 
 #include "gamma_context.h"
 #include "gamma_lock.h"
-#include "colormac.h"
+#include "main/colormac.h"
 
 #include "swrast/swrast.h"
 

diff --git a/src/mesa/drivers/dri/gamma/gamma_state.c b/src/mesa/drivers/dri/gamma/gamma_state.c
index 83b167a5b7a5d503a6c8c1ecbe03a217c30c905d..45ba521d70000c07037297701b963520d13e084e 100644 (file)
--- a/src/mesa/drivers/dri/gamma/gamma_state.c
+++ b/src/mesa/drivers/dri/gamma/gamma_state.c
@@ -29,7 +29,7 @@
 #include "buffers.h"
 #include "main/macros.h"
 #include "glint_dri.h"
-#include "colormac.h"
+#include "main/colormac.h"
 #include "swrast/swrast.h"
 #include "swrast_setup/swrast_setup.h"
 #include "vbo/vbo.h"

diff --git a/src/mesa/drivers/dri/gamma/gamma_texmem.c b/src/mesa/drivers/dri/gamma/gamma_texmem.c
index f5e66f577d5866eea552cb82cd44276801047972..7df001ff6de0191371fbe8c36a1ab7ea4d3253eb 100644 (file)
--- a/src/mesa/drivers/dri/gamma/gamma_texmem.c
+++ b/src/mesa/drivers/dri/gamma/gamma_texmem.c
@@ -3,7 +3,7 @@
 #include <stdio.h>
 
 #include "main/glheader.h"
-#include "colormac.h"
+#include "main/colormac.h"
 #include "main/macros.h"
 #include "main/mtypes.h"
 #include "main/simple_list.h"

diff --git a/src/mesa/drivers/dri/gamma/gamma_tris.c b/src/mesa/drivers/dri/gamma/gamma_tris.c
index 972735490b8531de77a040dc3bee1f03a3af4771..7899afd6736ec8d1a2aff0768c4aa099b05f17bf 100644 (file)
--- a/src/mesa/drivers/dri/gamma/gamma_tris.c
+++ b/src/mesa/drivers/dri/gamma/gamma_tris.c
@@ -32,7 +32,7 @@
 #include "main/glheader.h"
 #include "main/mtypes.h"
 #include "main/macros.h"
-#include "colormac.h"
+#include "main/colormac.h"
 
 #include "swrast/swrast.h"
 #include "swrast_setup/swrast_setup.h"

diff --git a/src/mesa/drivers/dri/gamma/gamma_vb.c b/src/mesa/drivers/dri/gamma/gamma_vb.c
index ef906115ec051f0eb003bfae982ab94aee3565f4..c11cfd281aa8856e8f954b0177f01a1e311125e9 100644 (file)
--- a/src/mesa/drivers/dri/gamma/gamma_vb.c
+++ b/src/mesa/drivers/dri/gamma/gamma_vb.c
@@ -29,7 +29,7 @@
 #include "main/mtypes.h"
 #include "main/imports.h"
 #include "main/macros.h"
-#include "colormac.h"
+#include "main/colormac.h"
 
 #include "swrast_setup/swrast_setup.h"
 #include "tnl/tcontext.h"