summaryrefslogtreecommitdiff
path: root/src/mesa/SConscript
AgeCommit message (Collapse)AuthorFilesLines
2018-10-19scons: Remove gles option.Jose Fonseca1-3/+1
It's broken, and WGL state tracker is always built with GLES support noawadays. Reviewed-by: Brian Paul <brianp@vmware.com> Reviewed-by: Roland Scheidegger <sroland@vmware.com>
2018-05-12scons: Add PROGRAM_NIR_FILES.Vinson Lee1-0/+1
Fix SCons build error. Linking build/linux-x86_64-debug/gallium/targets/libgl-xlib/libGL.so.1.5 ... build/linux-x86_64-debug/mesa/libmesa.a(st_program.os): In function `st_translate_prog_to_nir': src/mesa/state_tracker/st_program.c:392: undefined reference to `prog_to_nir' Fixes: 5c33e8c7729e ("st/nir: use NIR for asm programs") Signed-off-by: Vinson Lee <vlee@freedesktop.org>
2017-10-02build: Remove HAVE_DLOPENMatt Turner1-4/+0
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com> Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
2017-06-28scons: add code to generate format_fallback.c fileBrian Paul1-0/+7
Fixes: a1983223d8839a0c9 "mesa: Add _mesa_format_fallback_rgbx_to_rgba() [v2]" Reviewed-by: Roland Scheidegger <sroland@vmware.com> Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com> Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
2017-03-26scons: Fix dependencies of marshal_generated.[ch].Jose Fonseca1-2/+2
These generated source files depend not only upon gl_and_es_API.xml, but all other XML files that are included by it. This change updates the generation rules to depend on all gen/*.xml files, like done for other SCons generation rules, and should fix incremental broken SCons builds due to missing dependencies. Trivial.
2017-03-16glapi: Generate GL API marshalling code from the XML.Paul Berry1-0/+16
This is not yet used in the build, just generated. v2: Add missing build dependencies. v3: Avoid mixing declarations and code, remove logic for avoiding emitting code that the compiler's optimizer can deal with anyway. v4: (Timothy Arceri) move safe_mul() genereation here from a later patch. Acked-by: Timothy Arceri <tarceri@itsqueeze.com> Acked-by: Marek Olšák <maraeo@gmail.com> Tested-by: Dieter Nützel <Dieter@nuetzel-hh.de> Tested-by: Mike Lothian <mike@fireburn.co.uk>
2016-08-30glsl: Generate ir_expression_operation.h from PythonIan Romanick1-0/+1
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 <ian.d.romanick@intel.com> Reviewed-by: Matt Turner <mattst88@gmail.com> Acked-by: Dylan Baker <dylan@pnwbakers.com>
2016-08-27scons: Take indirect gl_and_es_API.xml dependencies in consideration.Jose Fonseca1-1/+1
Same as 26a8f76ba1a0229ee3332eaa6f1aea89d617cf3d. Trivial.
2016-07-20mesa: scons: remove left over src/glsl includeEmil Velikov1-1/+0
The path no longer exists. Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
2016-07-20mesa: scons: list builddir before srcdirEmil Velikov1-4/+4
Analogous to previous commit. Note: scons always uses OOT builds, while the in-tree generated files could be created either manually or by the autoconf build. Cc: "11.2 12.0" <mesa-stable@lists.freedesktop.org> Cc: Alexander von Gluck IV <kallisti5@unixzen.com> Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
2016-06-17scons: put the generated git_sha1.h file in top-level src/ directoryBrian Paul1-43/+2
To match what's done in the automake build. v2: Use git rev-parse to get a 10-character hash ID Fix Python imports Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com> Reviewed-by: José Fonseca <jfonseca@vmware.com>
2016-05-17mesa/st: add support for NIR as possible driver IRRob Clark1-0/+1
Signed-off-by: Rob Clark <robclark@freedesktop.org> Acked-by: Eric Anholt <eric@anholt.net>
2016-04-26scons: Whenever possible decide what to do based on platform and not compiler.Jose Fonseca1-2/+1
Because compilers like GCC and Clang are effectively available everywhere so their presence/absence is seldom conclusive. Furthermore, all compilers we use now have stdint.h. Reviewed-by: Roland Scheidegger <sroland@vmware.com> Reviewed-by: Brian Paul <brianp@vmware.com>
2016-01-26nir: move glsl_types.{cpp,h} to compilerEmil Velikov1-1/+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>
2015-10-16nir: remove dependency on glslRob Clark1-0/+1
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-03-25scons: Fix git_sha1.h generation fallback.Jose Fonseca1-3/+4
I didn't meant to remove the 'if not os.path.exists(filename)' statement. Reviewed-by: Brian Paul <brianp@vmware.com>
2015-03-22scons: Cleanup flex/bison settings specification.Jose Fonseca1-1/+1
Reviewed-by: Brian Paul <brianp@vmware.com>
2015-03-22scons: Ensure git_sha1.h's directory exists.Jose Fonseca1-1/+3
Reviewed-by: Brian Paul <brianp@vmware.com>
2015-03-18scons: Don't link program_lexer.l/y twice.Jose Fonseca1-8/+3
program/lex.yy.c and program/program_parse.tab.c is already included in the PROGRAM_FILES variable. We still need to specify the dependency relationship though. Reviewed-by: Brian Paul <brianp@vmware.com>
2015-03-05mesa: rename format_info.c to format_info.hEmil Velikov1-1/+1
The file is auto-generated, and #included by formats.c. Let's rename it to reflect the latter. This will also help up fix the dependency tracking by adding it to the _SOURCES variable, without the side effect of it being compiled (twice). v2: Update .gitignore to reflect the rename. Cc: "10.4, 10.5" <mesa-stable@lists.freedesktop.org> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Matt Turner <mattst88@gmail.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>
2015-01-12mesa: Autogenerate format_unpack.cJason Ekstrand1-0/+7
Signed-off-by: Jason Ekstrand <jason.ekstrand@intel.com> v2 by Samuel Iglesias <siglesias@igalia.com>: - Add usage of INDENT_FLAGS in Makefile.am v3 by Samuel Iglesias <siglesias@igalia.com>: - Modify unpack_float_*() and unpack_ubyte_*() function generation to use c.datatype() and f.datatype() - Fix out-of-tree build v4 by Samuel Iglesias <siglesias@igalia.com>: - format_unpack.c.mako is now format_unpack.py, with the template code inlined. It now auto-generates format_unpack.c - Add format_unpack.c to gitignore. - Simplify Makefile.am change - Modify SConscript to build format_unpack.c with scons v5 by Samuel Iglesias <siglesias@igalia.com>: - Don't allow float to non-normalized integer format conversions. Signed-off-by: Samuel Iglesias Gonsalvez <siglesias@igalia.com> Reviewed-by: Jason Ekstrand <jason.ekstrand@intel.com>
2015-01-12mesa: Autogenerate most of format_pack.cJason Ekstrand1-0/+7
We were auto-generating it before. The problem was that the autogeneration tool we were using was called "copy, paste, and edit". Let's use a more sensible solution. Signed-off-by: Jason Ekstrand <jason.ekstrand@intel.com> v2 by Samuel Iglesias <siglesias@igalia.com> - Remove format_pack.c as it is now autogenerated - Add usage of INDENT_FLAGS in Makefile.am - Remove trailing blank line v3 by Samuel Iglesias <siglesias@igalia.com> - Merge format_convert.py into format_parser.py - Adapt pack_*_* function generations - Fix out-of-tree build v4 by Samuel Iglesias <siglesias@igalia.com> - _get_datatype() is now a helper function v5 by Samuel Iglesias <siglesias@igalia.com> - format_pack.c.mako is now format_pack.py, with the template code inlined. It now auto-generates format_pack.c - Simplify Makefile.am change. - Modify SConscript to build format_pack.c with scons. - Remove run_mako.py - Add format_pack.c to gitignore v6 by Samuel Iglesias <siglesias@igalia.com>: - Don't allow float to non-normalized integer format conversions. - Add non-normalized formats support for ubyte packing functions. Merge the previously separated patch. - Add clamping for non-normalized integer formats in pack_ubyte*() v7 by Samuel Iglesias <siglesias@igalia.com>: - Add assert to check that sRGB formats are 8-bit size. Signed-off-by: Samuel Iglesias Gonsalvez <siglesias@igalia.com> Reviewed-by: Jason Ekstrand <jason.ekstrand@intel.com>
2014-08-05mesa/formats: Autogenerate the format_info structure from a CSV fileJason Ekstrand1-0/+7
Instead of a having all of the format metadata in a gigantic hard-to-edit array of type struct format_info, we now have a human-readable CSV file. The CSV file also contains more format information than the format_info struct contained so we can potentially make format_info more detailed later. The python to generate the format information was added the previous commit. This commit turns it on in both automake and scons builds. v2: Split into two commits and stuff to generate format_info.c from scons Signed-off-by: Jason Ekstrand <jason.ekstrand@intel.com> Reviewed-by: Brian Paul <brianp@vmware.com>
2014-08-04util: Move ralloc to a new src/util directory.Kenneth Graunke1-0/+1
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-08-04mesa/SConscript: Use Makefile.sources instead of duplicating the file listsJason Ekstrand1-333/+8
Signed-off-by: Jason Ekstrand <jason.ekstrand@intel.com> Reviewed-by: Marek Olšák <marek.olsak@amd.com>
2014-05-22scons: Fix x86_64 build.José Fonseca1-0/+1
x86/common_x86.c is required also for x86_64 builds. Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-03-07scons: Add drivers/common/meta_generate_mipmap.c to src/mesa/SConscript.Vinson Lee1-1/+2
This patch fixes this SCons build error introduced with commit 70e7905608b374f65d1f4b657f8ab61808c76ef6. build/linux-x86_64-debug/mesa/libmesa.a(driverfuncs.os): In function `_mesa_init_driver_functions': src/mesa/drivers/common/driverfuncs.c:99: undefined reference to `_mesa_meta_GenerateMipmap' Signed-off-by: Vinson Lee <vlee@freedesktop.org>
2014-02-21scons: Add main/pipelineobj.c to src/mesa/SConscript.Vinson Lee1-0/+1
This patch fixes this SCons build error. build/linux-x86_64-debug/mesa/libmesa.a(context.os): In function `init_attrib_groups': src/mesa/main/context.c:815: undefined reference to `_mesa_init_pipeline' Signed-off-by: Vinson Lee <vlee@freedesktop.org>
2014-02-12scons: add meta_blit.c to src/mesa/SConscriptBrian Paul1-0/+1
2014-02-05mesa/cs: Add dispatch API stubs for ARB_compute_shader.Paul Berry1-0/+1
Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-02mesa: move glGenerateMipmap() code into new genmipmap.c fileBrian Paul1-0/+1
Mipmap generation has nothing to do with FBOs. v2: update gl_genexec.py too (not api_exec.c) Acked-by: Kenneth Graunke <kenneth@whitecape.org>
2014-02-02mesa: move glBlitFramebuffer code into new blit.c fileBrian Paul1-0/+1
Just for better organization. v2: update gl_genexec.py too (not api_exec.c) Acked-by: Kenneth Graunke <kenneth@whitecape.org>
2014-01-15scons: add new shaderimage.c file to the buildBrian Paul1-0/+1
2013-12-13mesa: Add API definitions for ARB_texture_viewCourtney Goeltzenleuchter1-0/+1
Stub in glTextureView API call to go with the glTextureView API xml definition. Includes dispatch test for glTextureView Signed-off-by: Courtney Goeltzenleuchter <courtney@LunarG.com> Reviewed-by: Brian Paul <brianp@vmware.com>
2013-11-16scons: drop obsolete enabled_apis variableEmil Velikov1-7/+0
The variable was forgotten during the FEATURE_* removal. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2013-10-26mesa: add vdpau.c and st_vdpau.c to src/mesa/SConscriptBrian Paul1-0/+2
Fixes SCons build.
2013-09-26mesa: Add core support for the GL_AMD_performance_monitor extension.Kenneth Graunke1-0/+1
This provides an interface for applications (and OpenGL-based tools) to access GPU performance counters. Since the exact performance counters available vary between vendors and hardware generations, the extension provides an API the application can use to get the names, types, and minimum/maximum values of all available counters. Counters are also organized into groups. Applications create "performance monitor" objects, select the counters they want to track, and Begin/End monitoring, much like OpenGL's query API. Multiple monitors can be in flight simultaneously. v2: Pass ctx to all driver hooks (suggested by Christoph), and attempt to fix overallocation of bitsets (caught by Christoph). Incomplete. v3: Significantly rework core data structures. Store counters in groups rather than in a global list. Use their array index in the group's counter list as the ID rather than trying to store a globally unique counter ID. Use bitsets for active counters within a group, and also track which groups are active so that's easy to query. v4: Remove _mesa_ prefix on static functions; detect out of memory conditions in new_performance_monitor(); make BeginPerfMonitor hook return a boolean rather than setting m->Active or raising an error. Switch to GLuint/unsigned for NumGroups, NumCounters, and MaxActiveCounters (which also means switching a bunch of temporary variable types). All suggested by Brian Paul. Also, remove commented out code at the bottom of the block. Finally, fix the dispatch sanity test (noticed by Ian Romanick). Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Brian Paul <brianp@vmware.com> [v3] Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2013-09-04mesa: Update builds scripts to build object labelsTimothy Arceri1-0/+1
Signed-off-by: Timothy Arceri <t_arceri@yahoo.com.au> Reviewed-by: Brian Paul <brianp@vmware.com>
2013-07-01scons: Fix dependencies of enums.c and api_exec.c.José Fonseca1-17/+0
2013-05-01scons: remove IN_DRI_DRIVERAndreas Boll1-1/+0
Not used anymore.
2013-04-25scons: Support clang.José Fonseca1-1/+2
clang is supports most gcc options / extensions, with a some exceptions. The biggest advantage of using clang is that compilation times are much short. One can tell scons to use clang when building by invoking it as CC=clang CXX=clang++ scons libgl-xlib
2013-04-17mesa: generate glGetInteger/Boolean/Float/Doublev() code for all APIsBrian Paul1-6/+1
No longer pass -a flag to the get_hash_generate.py script to specify OpenGL, ES1, ES2, etc. This updates the autoconf, scons and android build files too (so we can bisect). This is the last of the API-dependent conditional compilation in core Mesa. Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
2013-04-11scons: Add st_cb_msaa.c to source list.José Fonseca1-0/+1
2013-03-13scons: Define PACKAGE_VERSION/BUGREPORT globally.José Fonseca1-5/+0
Fixes the scons build.
2013-03-13scons: Define PACKAGE_xxxJosé Fonseca1-0/+5
Should get the builds going again.
2013-01-21scons: Fix dependencies of generated headers.José Fonseca1-21/+2
It appears that scons implicit dependency scanners fail to chain dependencies of generated headers when these are outside the build tree. This patch ensures generated source files are _always_ put in the build tree. I'm not 100% this will fix all depency issues, but from my experiments it does seem to fix this. NOTE: For this to be effective it is necessary to clean the source tree from generated header/source files. Reviewed-by: Brian Paul <brianp@vmware.com>
2013-01-16mesa: add new formatquery.c file to SConscript file to fix buildBrian Paul1-0/+1
2013-01-07mesa: Don't use rtasm for Haiku swrastAlexander von Gluck IV1-1/+1
* We have a symbol conflict as rtasm in Mesa collides with rtasm in gallium. * As us linking gallium and mesa together is an edge case, lets just omit the rtasm code from Mesa as we should be going llvmpipe soon :)
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-19 14:40:20 +0000