diff options
| author | Brian Paul <brianp@vmware.com> | 2010-06-10 22:32:21 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2010-06-10 22:32:21 -0600 |
| commit | 412cddf954d35282f913d01d83d3cdb45cf0e2d0 (patch) | |
| tree | 931ab36ff81ed82b3c7be41917a166033dd41b26 /src/mesa/drivers | |
| parent | 70c8d29b6bb3214966892d51e6b2befa7040622d (diff) | |
mesa: move arbprogram.[ch] to main/
Diffstat (limited to 'src/mesa/drivers')
| -rw-r--r-- | src/mesa/drivers/common/meta.c | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/common/dri_metaops.c | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_pixel_bitmap.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c index f808e15b33..93848287dd 100644 --- a/src/mesa/drivers/common/meta.c +++ b/src/mesa/drivers/common/meta.c @@ -34,6 +34,7 @@ #include "main/glheader.h" #include "main/mtypes.h" #include "main/imports.h" +#include "main/arbprogram.h" #include "main/arrayobj.h" #include "main/blend.h" #include "main/bufferobj.h" @@ -62,7 +63,6 @@ #include "main/varray.h" #include "main/viewport.h" #include "shader/program.h" -#include "shader/arbprogram.h" #include "swrast/swrast.h" #include "drivers/common/meta.h" diff --git a/src/mesa/drivers/dri/common/dri_metaops.c b/src/mesa/drivers/dri/common/dri_metaops.c index dfb7d64040..9151c03b5e 100644 --- a/src/mesa/drivers/dri/common/dri_metaops.c +++ b/src/mesa/drivers/dri/common/dri_metaops.c @@ -26,6 +26,7 @@ * **************************************************************************/ +#include "main/arbprogram.h" #include "main/arrayobj.h" #include "main/bufferobj.h" #include "main/enable.h" @@ -33,7 +34,6 @@ #include "main/texstate.h" #include "main/varray.h" #include "main/viewport.h" -#include "shader/arbprogram.h" #include "shader/program.h" #include "dri_metaops.h" diff --git a/src/mesa/drivers/dri/intel/intel_pixel_bitmap.c b/src/mesa/drivers/dri/intel/intel_pixel_bitmap.c index 076fee89bd..0e2fe893fe 100644 --- a/src/mesa/drivers/dri/intel/intel_pixel_bitmap.c +++ b/src/mesa/drivers/dri/intel/intel_pixel_bitmap.c @@ -26,6 +26,7 @@ **************************************************************************/ #include "main/glheader.h" +#include "main/arbprogram.h" #include "main/enums.h" #include "main/image.h" #include "main/colormac.h" @@ -44,7 +45,6 @@ #include "main/attrib.h" #include "main/enable.h" #include "main/viewport.h" -#include "shader/arbprogram.h" #include "swrast/swrast.h" #include "intel_screen.h" |