diff options
| author | Zou Nan hai <[email protected]> | 2007-07-17 15:42:39 +0800 |
|---|---|---|
| committer | Zou Nan hai <[email protected]> | 2007-07-17 15:42:39 +0800 |
| commit | 3c00cdc5f37856f303a6256677364ae89200c509 (patch) | |
| tree | b4f191fb2bbe9b409fdc775db8f537c439974a21 /src/mesa/swrast/s_fragprog.c | |
| parent | 24e7acd5e4f1e7e71909f94fd1f075abd268d086 (diff) | |
| parent | 7b410f366fa117a03a7e838562215d2dca3f8cbc (diff) | |
Merge branch 'master' of git+ssh://[email protected]/git/mesa/mesa into 965-glsl
Diffstat (limited to 'src/mesa/swrast/s_fragprog.c')
| -rw-r--r-- | src/mesa/swrast/s_fragprog.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/swrast/s_fragprog.c b/src/mesa/swrast/s_fragprog.c index 923b67e78e6..14c9868c180 100644 --- a/src/mesa/swrast/s_fragprog.c +++ b/src/mesa/swrast/s_fragprog.c @@ -22,11 +22,11 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "glheader.h" -#include "colormac.h" -#include "context.h" -#include "prog_instruction.h" -#include "texstate.h" +#include "main/glheader.h" +#include "main/colormac.h" +#include "main/context.h" +#include "main/texstate.h" +#include "shader/prog_instruction.h" #include "s_fragprog.h" #include "s_span.h" |