On Tue, Apr 5, 2016 at 1:14 PM, Emil Velikov <emil.l.veli...@gmail.com> wrote: > On 26 March 2016 at 21:02, Rob Clark <robdcl...@gmail.com> wrote: >> From: Rob Clark <robcl...@freedesktop.org> >> >> Signed-off-by: Rob Clark <robcl...@freedesktop.org> >> --- >> src/mesa/Makefile.sources | 2 + >> src/mesa/state_tracker/st_nir.h | 28 +++ >> src/mesa/state_tracker/st_nir_lower_builtin.c | 242 >> ++++++++++++++++++++++++++ >> 3 files changed, 272 insertions(+) >> create mode 100644 src/mesa/state_tracker/st_nir.h >> create mode 100644 src/mesa/state_tracker/st_nir_lower_builtin.c >> >> diff --git a/src/mesa/Makefile.sources b/src/mesa/Makefile.sources >> index 7b5b6ea..6c93d07 100644 >> --- a/src/mesa/Makefile.sources >> +++ b/src/mesa/Makefile.sources >> @@ -495,6 +495,8 @@ STATETRACKER_FILES = \ >> state_tracker/st_manager.h \ >> state_tracker/st_mesa_to_tgsi.c \ >> state_tracker/st_mesa_to_tgsi.h \ >> + state_tracker/st_nir.h \ > Nice, thank you. > >> + state_tracker/st_nir_lower_builtin.c \ > In general if any of these have link-time dependency of nir I'd stick > them into separate list. This way we don't need to worry about > adding/breaking scons.
btw, I guess if your last patchset adds nir back to scons build, we can skip this? >> state_tracker/st_program.c \ >> state_tracker/st_program.h \ >> state_tracker/st_texture.c \ >> diff --git a/src/mesa/state_tracker/st_nir.h >> b/src/mesa/state_tracker/st_nir.h >> new file mode 100644 >> index 0000000..1c07c4c >> --- /dev/null >> +++ b/src/mesa/state_tracker/st_nir.h >> @@ -0,0 +1,28 @@ >> +/* >> + * Copyright © 2016 Red Hat >> + * >> + * Permission is hereby granted, free of charge, to any person obtaining a >> + * copy of this software and associated documentation files (the >> "Software"), >> + * to deal in the Software without restriction, including without limitation >> + * the rights to use, copy, modify, merge, publish, distribute, sublicense, >> + * and/or sell copies of the Software, and to permit persons to whom the >> + * Software is furnished to do so, subject to the following conditions: >> + * >> + * The above copyright notice and this permission notice (including the next >> + * paragraph) shall be included in all copies or substantial portions of the >> + * Software. >> + * >> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS >> OR >> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, >> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL >> + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR >> OTHER >> + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING >> FROM, >> + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS >> IN THE >> + * SOFTWARE. >> + */ >> + >> +#pragma once >> + > The latest consensus was to avoid these (and remove the existing ones > in tree) in favour of the old fashioned ifndef FOO #define FOO guards. oh, right.. this originally pre-dated the list discussion and I forgot about it ;-) BR, -R > -Emil _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
