diff options
| author | Ian Romanick <[email protected]> | 2015-04-15 16:59:43 -0700 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2016-08-30 16:28:00 -0700 |
| commit | 7d6af9e59935959689ac9611f17abc06c6837f16 (patch) | |
| tree | b918953b0f8e936ae0bb9bc42111179fa110df92 /src/mesa | |
| parent | 10f9901bcef7724cb72fb2fe7e3dd8d6660d2f34 (diff) | |
glsl: Generate ir_expression_operation.h from Python
There are differences in where end-of-line comments are placed, but
'diff -wud' is clean.
v2: Massive rebase.
v3: With much help from José Fonseca, fix SCons build.
Signed-off-by: Ian Romanick <[email protected]>
Reviewed-by: Matt Turner <[email protected]>
Acked-by: Dylan Baker <[email protected]>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/Makefile.sources | 1 | ||||
| -rw-r--r-- | src/mesa/SConscript | 1 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/Makefile.am | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/src/mesa/Makefile.sources b/src/mesa/Makefile.sources index 36227603652..f941c966723 100644 --- a/src/mesa/Makefile.sources +++ b/src/mesa/Makefile.sources @@ -650,6 +650,7 @@ INCLUDE_DIRS = \ -I$(top_srcdir)/include \ -I$(top_builddir)/src \ -I$(top_srcdir)/src \ + -I$(top_builddir)/src/compiler/glsl \ -I$(top_builddir)/src/compiler/nir \ -I$(top_builddir)/src/mesa \ -I$(top_srcdir)/src/mesa \ diff --git a/src/mesa/SConscript b/src/mesa/SConscript index 13a2e6a7a2c..e375de6ee77 100644 --- a/src/mesa/SConscript +++ b/src/mesa/SConscript @@ -11,6 +11,7 @@ env.MSVC2013Compat() env.Append(CPPPATH = [ '../compiler/nir', # for generated nir_opcodes.h, etc + '../compiler/glsl', # for generated headers '#/src', Dir('../mapi'), # src/mapi build path '#/src/mapi', diff --git a/src/mesa/drivers/dri/i965/Makefile.am b/src/mesa/drivers/dri/i965/Makefile.am index 14dbb9cd6d9..91559c5b1fb 100644 --- a/src/mesa/drivers/dri/i965/Makefile.am +++ b/src/mesa/drivers/dri/i965/Makefile.am @@ -35,6 +35,7 @@ AM_CFLAGS = \ -I$(top_srcdir)/src/gtest/include \ -I$(top_srcdir)/src/compiler/nir \ -I$(top_srcdir)/src/intel \ + -I$(top_builddir)/src/compiler/glsl \ -I$(top_builddir)/src/compiler/nir \ -I$(top_builddir)/src/intel \ -I$(top_builddir)/src/mesa/drivers/dri/common \ |