diff options
| author | Rob Clark <[email protected]> | 2015-10-10 13:55:07 -0400 |
|---|---|---|
| committer | Rob Clark <[email protected]> | 2015-10-16 19:33:38 -0400 |
| commit | b9b40ef9b7644ea24768bc8b7464b1719efe99bf (patch) | |
| tree | ccca8ea0f2a4d0cbc6009cade33d9daf3c588c07 /src/mesa/main/uniforms.h | |
| parent | 183db3a64557d5d231ef58ab5666286f323ff333 (diff) | |
nir: remove dependency on glsl
Move glsl_types into NIR, now that the dependency on glsl_symbol_table
has been split out.
Possibly makes sense to rename things at this point, but if we do that
I'd like to keep it split out into a separate patch to make git history
easier to follow (IMHO).
v2: fix android build
v3: I f***ing hate scons.. but at least it builds
Reviewed-by: Jason Ekstrand <[email protected]>
Signed-off-by: Rob Clark <[email protected]>
Diffstat (limited to 'src/mesa/main/uniforms.h')
| -rw-r--r-- | src/mesa/main/uniforms.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/main/uniforms.h b/src/mesa/main/uniforms.h index bec035cdc97..2f88b65043d 100644 --- a/src/mesa/main/uniforms.h +++ b/src/mesa/main/uniforms.h @@ -27,7 +27,7 @@ #define UNIFORMS_H #include "main/glheader.h" -#include "glsl/glsl_types.h" +#include "glsl/nir/glsl_types.h" #include "glsl/ir_uniform.h" #include "program/prog_parameter.h" |