projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote branch 'origin/master' into glsl2
[mesa.git]
/
src
/
glsl
/
program.h
diff --git
a/src/glsl/program.h
b/src/glsl/program.h
index bb1cd919cd62d647643310dfc06c8fea432db6f1..0a49203d4b2f918edea159ee90b8320f967cf6ac 100644
(file)
--- a/
src/glsl/program.h
+++ b/
src/glsl/program.h
@@
-25,8
+25,8
@@
#include "main/mtypes.h"
extern "C" {
-#include "
shader
/prog_parameter.h"
-#include "
shader
/prog_uniform.h"
+#include "
program
/prog_parameter.h"
+#include "
program
/prog_uniform.h"
}
extern void