From e95948ea03bd479f5961452647d3993aa0ab05f6 Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Fri, 19 Feb 2010 00:51:21 -0800 Subject: [PATCH] gamma: s#colormac.h#main/colormac.h# --- src/mesa/drivers/dri/gamma/gamma_context.h | 2 +- src/mesa/drivers/dri/gamma/gamma_span.c | 2 +- src/mesa/drivers/dri/gamma/gamma_state.c | 2 +- src/mesa/drivers/dri/gamma/gamma_texmem.c | 2 +- src/mesa/drivers/dri/gamma/gamma_tris.c | 2 +- src/mesa/drivers/dri/gamma/gamma_vb.c | 2 +- 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 c386aa3007a..f702eee945d 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 7376ecf8e41..b96e49eadcf 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 83b167a5b7a..45ba521d700 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 f5e66f577d5..7df001ff6de 100644 --- a/src/mesa/drivers/dri/gamma/gamma_texmem.c +++ b/src/mesa/drivers/dri/gamma/gamma_texmem.c @@ -3,7 +3,7 @@ #include #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 972735490b8..7899afd6736 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 ef906115ec0..c11cfd281aa 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" -- 2.30.2