diff options
| author | Brian <brian@yutani.localnet.net> | 2007-03-26 10:13:02 -0600 |
|---|---|---|
| committer | Brian <brian@yutani.localnet.net> | 2007-03-26 10:13:02 -0600 |
| commit | d619cceea47dc3070ebb7f7ea4f8b6b31a672d38 (patch) | |
| tree | f8b8a9f3fdc3f17a43436af270b22754b1749d31 /src/mesa/drivers/dri/nouveau/nouveau_shader.c | |
| parent | 76f3b66e0489526694d6a39b4a6ac3b1c2bee100 (diff) | |
| parent | e71c34aaa173ca451fa02e526ead77758f7eeb74 (diff) | |
merge of glsl-compiler-1 branch
Diffstat (limited to 'src/mesa/drivers/dri/nouveau/nouveau_shader.c')
| -rw-r--r-- | src/mesa/drivers/dri/nouveau/nouveau_shader.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_shader.c b/src/mesa/drivers/dri/nouveau/nouveau_shader.c index 3d5b6843a1..b6837c5de1 100644 --- a/src/mesa/drivers/dri/nouveau/nouveau_shader.c +++ b/src/mesa/drivers/dri/nouveau/nouveau_shader.c @@ -35,9 +35,10 @@ #include "enums.h" #include "extensions.h" -#include "program.h" +#include "shader/program.h" +#include "shader/prog_instruction.h" +/*#include "shader/arbprogparse.h"*/ #include "tnl/tnl.h" -#include "shader/arbprogparse.h" #include "nouveau_context.h" #include "nouveau_shader.h" |