summaryrefslogtreecommitdiff
path: root/src/glsl/SConscript
AgeCommit message (Collapse)AuthorFilesLines
2016-01-26glsl: move to compiler/Emil Velikov1-122/+0
Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Acked-by: Matt Turner <mattst88@gmail.com> Acked-by: Jose Fonseca <jfonseca@vmware.com>
2016-01-26nir: move glsl_types.{cpp,h} to compilerEmil Velikov1-7/+0
Allows us to remove the SCons workaround :-) Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Acked-by: Matt Turner <mattst88@gmail.com> Acked-by: Jose Fonseca <jfonseca@vmware.com>
2016-01-26nir: move shader_enums.[ch] to compilerEmil Velikov1-2/+1
This way one can reuse it in glsl, nir or other infrastructure without pulling nir as dependency. Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Acked-by: Matt Turner <mattst88@gmail.com> Acked-by: Jose Fonseca <jfonseca@vmware.com>
2016-01-08glsl: Don't add nir files to libglsl_la_SOURCESKristian Høgsberg Kristensen1-0/+1
SCons doesn't understand nir yet and doesn't want to compile the glsl to nir pass. Move the files to their own variable so we can add it only for automake. Tested-by: Brian Paul <brianp@vmware.com>
2015-10-19scons: Build nir/glsl_types.cpp once.Jose Fonseca1-1/+6
Undoes early hacks, and ensures nir/glsl_types.cpp is built once, and only once. The root problem is that SCons doesn't know about NIR nor any source file in the NIR_FILES source list. Tested with libgl-gdi and libgl-xlib scons targets. Reviewed-by: Brian Paul <brianp@vmware.com>
2015-10-16nir: remove dependency on glslRob Clark1-0/+2
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 <jason@jlekstrand.net> Signed-off-by: Rob Clark <robclark@freedesktop.org>
2015-06-12mesa; add a dummy _mesa_error_no_memory() symbol to libglsl_utilEmil Velikov1-1/+3
Rather than forcing everyone to provide their own definition of the symbol provide a common (dummy) one. This helps us resolve the build of the standalone pipe-drivers (amongst others), which are missing the symbol. Cc: Rob Clark <robclark@freedesktop.org> Cc: "10.6" <mesa-stable@lists.freedesktop.org> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2015-03-22scons: Cleanup flex/bison settings specification.Jose Fonseca1-8/+12
Reviewed-by: Brian Paul <brianp@vmware.com>
2015-03-04scons: Use -Werror MSVC compatibility flags per-directory.Jose Fonseca1-0/+2
Matching what we already do with autotools builds. Reviewed-by: Brian Paul <brianp@vmware.com>
2015-02-20mesa: Add gallium include dirs to more parts of the tree.Eric Anholt1-0/+2
v2: Try to patch up the scons bits. Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
2014-08-04util: Move the open-addressing linear-probing hash_table to src/util.Kenneth Graunke1-2/+0
This hash table is used in core Mesa, the GLSL compiler, and the i965 driver, which makes it a good candidate for the new src/util module. It's much faster than program/hash_table.[ch] (see commit 6991c2922f5 for data), and José's u_hash_table.c has a comment saying Gallium should probably consider switching to a linear probing hash table at some point. So this seems like the best candidate for a shared data structure. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> v2 (Jason Ekstrand): Pick up another hash_table use and patch up scons Signed-off-by: Jason Ekstrand <jason.ekstrand@intel.com> Reviewed-by: Marek Olšák <marek.olsak@amd.com>
2014-08-04util: Move ralloc to a new src/util directory.Kenneth Graunke1-0/+3
For a long time, we've wanted a place to put utility code which isn't directly tied to Mesa or Gallium internals. This patch creates a new src/util directory for exactly that purpose, and builds the contents as libmesautil.la. ralloc seemed like a good first candidate. These days, it's directly used by mesa/main, i965, i915, and r300g, so keeping it in src/glsl didn't make much sense. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> v2 (Jason Ekstrand): More realloc uses and some scons fixes Signed-off-by: Jason Ekstrand <jason.ekstrand@intel.com> Reviewed-by: Marek Olšák <marek.olsak@amd.com>
2014-05-30scons: add common.c as part of glcpp buildTapani Pälli1-1/+1
to have _mesa_error_no_memory function available Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=79440 Signed-off-by: Tapani Pälli <tapani.palli@intel.com> Reviewed-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
2013-10-07glsl_compiler: Re-enable building glsl_compilerIan Romanick1-3/+3
This allows application developers to use Mesa's compiler as a standalone validator for their shaders. This is mostly a revert of commit 569f0e4. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2013-09-09glsl: Remove builtin_compiler from the build system.Kenneth Graunke1-48/+18
We don't actually use anything from builtin_function.cpp, so we don't need to generate it anymore. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com> Acked-by: Paul Berry <stereotype441@gmail.com>
2013-01-24scons: Add imports.c to builtin_compiler build.Vinson Lee1-0/+2
Fixes build regression introduced by commit eac030e38e3cdd4ed4534516e3d3a50c8a372719. Signed-off-by: Vinson Lee <vlee@freedesktop.org> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=59835
2013-01-22glsl/Makefile.sources: Correct BUILTIN_COMPILER_CXX_FILESMatt Turner1-3/+2
Squashed with two reverts: Revert "android: Update for builtin_stubs.cpp move" This reverts commit c0def90ede1e939173041b8785303de90f8fdc6c. Revert "scons: Update for builtin_stubs.cpp" This reverts commit 8ac4b82699ad0a59ae6ae6d3415702eaa5d4fe3b. Tested-by: Andreas Boll <andreas.boll.dev@gmail.com> Tested-on-Android-by: Chad Versace <chad.versace@linux.intel.com>
2012-12-07mesa: Use the new hash table for the variable refcount visitor.Eric Anholt1-0/+4
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com> [jordan.l.justen@intel.com: open_hash_table => hash_table] Signed-off-by: Jordan Justen <jordan.l.justen@intel.com> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2012-12-07program/hash_table.c: rename to program/prog_hash_table.cJordan Justen1-2/+2
Removes a collision of the object file name for main/hash_table and program/hash_table. Signed-off-by: Jordan Justen <jordan.l.justen@intel.com> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2012-11-12automake: Merge *_CXX_FILES variables in the glsl build.Eric Anholt1-1/+1
Reviewed-by: Chad Versace <chad.versace@linux.intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2012-11-02scons: Update for builtin_stubs.cppJosé Fonseca1-3/+4
Note this by itself is not enough to fix scons build -- it will fail until you remove: rm -rf build/*/glsl/builtin_compiler because that node was a filei before, but it will be now a directory. This also means that bisecting across this change will require wiping the build directory..
2012-09-29scons: Use full path of texture_builtins.py.Vinson Lee1-1/+1
Fixes this build error on Cygwin. Explicit dependency `src/glsl/builtins/tools/texture_builtins.py' not found, needed by target `build/cygwin-x86-debug/glsl/builtin_function.cpp'. Signed-off-by: Vinson Lee <vlee@freedesktop.org> Reviewed-by: Brian Paul <brianp@vmware.com>
2012-09-15scons: add new -p (prefix) options for yaccBrian Paul1-1/+1
These were recently added to the Makefiles.
2012-08-02scons: set YACCHXXFILESUFFIX to stop needless rebuilding of the parserJosé Fonseca1-0/+4
Before, the GLSL parser was getting rebuilt every time that scons was run. The problem was scons was expecting a glsl_parser.hpp file but we were generating a glsl_parser.h file. Signed-off-by: Brian Paul <brianp@vmware.com>
2012-06-23scons: Add glsl/glcpp to the include path.Vinson Lee1-2/+2
Fixes this build failure on Solaris. Compiling build/sunos-debug/glsl/glcpp/glcpp-lex.c ... "src/glsl/glcpp/glcpp-lex.l", line 30: cannot find include file: "glcpp-parse.h" Signed-off-by: Vinson Lee <vlee@freedesktop.org> Reviewed-by: Brian Paul <brianp@vmware.com>
2012-01-30glsl: rename Makefile.sources' _SOURCES variablesMatt Turner1-3/+3
automake uses variables named *_SOURCES. Reviewed-by: Eric Anholt <eric@anholt.net> Tested-by: Eric Anholt <eric@anholt.net> Signed-off-by: Matt Turner <mattst88@gmail.com>
2011-11-02scons: include src/glsl/Makefile.sourcesChia-I Wu1-68/+14
Reviewed-by: Brian Paul <brianp@vmware.com>
2011-10-25scons: Add link_uniforms.cpp to SConscript.Vinson Lee1-0/+1
2011-09-23glsl: Implement a lowering pass for gl_ClipDistance.Paul Berry1-0/+1
In i965 GEN6+ (and I suspect most other hardware), gl_ClipDistance needs to be laid out as a pair of vec4's (the first containing clip distances 0-3, and the second containing clip distances 4-7). However, it is declared in GLSL as an array of 8 floats. This lowering pass acts at the GLSL level, modifying the declaration of gl_ClipDistance so that it is an array of vec4's rather than an array of floats, and renaming it to gl_ClipDistanceMESA. In addition, it modifies all accesses to the array so that they access the appropiate component of one of the vec4's. Since some hardware may not internally represent gl_ClipDistance as a pair of vec4's, this lowering pass is optional. To enable it, set the LowerClipDistance flag in gl_shader_compiler_options to true. Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2011-07-22glsl: Add standalone_scaffolding.cpp to SConscript.Vinson Lee1-0/+1
2011-07-20glsl: Add ir_function_detect_recursion.cpp to SConscript.Vinson Lee1-0/+1
2011-06-17scons: make embedding orthogonal to the platformJosé Fonseca1-2/+2
To enable embedding in platforms other than linux.
2011-03-15scons: copy hash_table.c, symbol_table.c to glsl directoryJose Fonseca1-2/+7
This fixes an issue where the .obj files wound up in the src/ directory rather than the build/ directory. That prevented combined 32-bit and 64-bit builds from working. Signed-off-by: Brian Paul <brianp@vmware.com>
2011-03-04scons: Unbreak mingw cross compilation.José Fonseca1-7/+12
2011-03-04scons: Get glsl2 and glcpp programs building correctly.José Fonseca1-20/+21
2011-03-03scons: More tweaks to fix MinGW build.José Fonseca1-5/+16
2011-03-03scons: Ensure generated headers are in the include path.José Fonseca1-0/+3
2011-03-01scons: Use Flex and Bison to generate lexer/parser files.Kenneth Graunke1-4/+15
This gets it building again here; I'll leave it up to the SCons maintainers to make further improvements.
2011-02-11scons: builtin_glsl_function on windows needs bundled getopt.José Fonseca1-1/+7
2011-02-11scons: Try to support building 64bit binaries on 32bit windows.José Fonseca1-4/+1
2011-02-04glsl: Add opt_copy_propagation_elements.cpp to SConscript.Vinson Lee1-0/+1
Fixes SCons build.
2011-01-31scons/glsl: add top-level 'include' dir to CPPPATHBrian Paul1-0/+1
To avoid using the /usr/include/GL/gl.h file which may be lacking some special #defines.
2011-01-31Remove talloc from the SCons build system.Kenneth Graunke1-19/+1
2011-01-31ralloc: Add a fake implementation of ralloc based on talloc.Kenneth Graunke1-0/+1
2011-01-25glsl: Fix mingw crosscompileJakob Bornecrantz1-0/+1
2011-01-13scons: Fix cross-compilation.José Fonseca1-30/+39
Hairy stuff. Don't know how to do it better though.
2011-01-12glsl: Make builtin_compiler build on Windows with MSVC.José Fonseca1-1/+13
2011-01-12getopt: Import OpenBSD getopt implementation for MSVC.José Fonseca1-0/+4
2011-01-10glsl: Autogenerate builtin_functions.cpp as part of the build process.Kenneth Graunke1-2/+22
Python is already necessary for other parts of Mesa, so there's no reason we can't just generate it. This patch updates both make and SCons to do so.
2010-12-14glsl: new glsl_strtod() wrapper to fix decimal point interpretationBrian Paul1-0/+1
We always want to use '.' as the decimal point. See http://bugs.freedesktop.org/show_bug.cgi?id=24531 NOTE: this is a candidate for the 7.10 branch.
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-15 09:45:43 +0000