summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVinson Lee <vlee@vmware.com>2010-02-19 00:51:21 -0800
committerVinson Lee <vlee@vmware.com>2010-02-19 00:51:21 -0800
commite95948ea03bd479f5961452647d3993aa0ab05f6 (patch)
treeba0a9bfa6508f477ecda17a32a4e28f265349636
parent24bdace350a65d405214696f77e74f3d0fe5186a (diff)
gamma: s#colormac.h#main/colormac.h#
-rw-r--r--src/mesa/drivers/dri/gamma/gamma_context.h2
-rw-r--r--src/mesa/drivers/dri/gamma/gamma_span.c2
-rw-r--r--src/mesa/drivers/dri/gamma/gamma_state.c2
-rw-r--r--src/mesa/drivers/dri/gamma/gamma_texmem.c2
-rw-r--r--src/mesa/drivers/dri/gamma/gamma_tris.c2
-rw-r--r--src/mesa/drivers/dri/gamma/gamma_vb.c2
6 files changed, 6 insertions, 6 deletions
diff --git a/src/mesa/drivers/dri/gamma/gamma_context.h b/src/mesa/drivers/dri/gamma/gamma_context.h
index c386aa3007..f702eee945 100644
--- 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 7376ecf8e4..b96e49eadc 100644
--- 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 83b167a5b7..45ba521d70 100644
--- 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 f5e66f577d..7df001ff6d 100644
--- 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 972735490b..7899afd673 100644
--- 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 ef906115ec..c11cfd281a 100644
--- 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"