summaryrefslogtreecommitdiffstats
path: root/src/gallium/targets/libgl-xlib
Commit message (Collapse)AuthorAgeFilesLines
* s/Tungsten Graphics/VMware/José Fonseca2014-01-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tungsten Graphics Inc. was acquired by VMware Inc. in 2008. Leaving the old copyright name is creating unnecessary confusion, hence this change. This was the sed script I used: $ cat tg2vmw.sed # Run as: # # git reset --hard HEAD && find include scons src -type f -not -name 'sed*' -print0 | xargs -0 sed -i -f tg2vmw.sed # # Rename copyrights s/Tungsten Gra\(ph\|hp\)ics,\? [iI]nc\.\?\(, Cedar Park\)\?\(, Austin\)\?\(, \(Texas\|TX\)\)\?\.\?/VMware, Inc./g /Copyright/s/Tungsten Graphics\(,\? [iI]nc\.\)\?\(, Cedar Park\)\?\(, Austin\)\?\(, \(Texas\|TX\)\)\?\.\?/VMware, Inc./ s/TUNGSTEN GRAPHICS/VMWARE/g # Rename emails s/[email protected]/[email protected]/ s/[email protected]/[email protected]/g s/jrfonseca-at-tungstengraphics-dot-com/jfonseca-at-vmware-dot-com/ s/jrfonseca\[email protected]/[email protected]/g s/keithw\[email protected]/[email protected]/g s/[email protected]/[email protected]/g s/thomas-at-tungstengraphics-dot-com/thellstom-at-vmware-dot-com/ s/[email protected]/[email protected]/ # Remove dead links s@Tungsten Graphics (http://www.tungstengraphics.com)@Tungsten Graphics@g # C string src/gallium/state_trackers/vega/api_misc.c s/"Tungsten Graphics, Inc"/"VMware, Inc"/ Reviewed-by: Brian Paul <[email protected]>
* gallium/targets/libgl-xlib: X11/Xlib.h: No such file or directoryGaetan Nadon2013-10-091-1/+1
| | | | | | | | | | | | | | | The compiler cannot find the Xlib.h in the installed system headers. All supplied include directives point to inside the mesa module. The X11_CFLAGS variable is undefined (not defined in config.status). It appears the intent was to use X11_INCLUDES defined in configure.ac. The Xlib.h file is not installed on my workstation. It is supplied in the libx11-dev package. This allows an X developer control over which version of this file is used for X development. Acked-by: Brian Paul <[email protected]> Signed-off-by: Gaetan Nadon <[email protected]>
* st/glx: consolidate C sources list into Makefile.sourcesEmil Velikov2013-10-011-1/+1
| | | | | | | Move glx/{,xlib/}Makefile.am to preserve file list Signed-off-by: Emil Velikov <[email protected]> Reviewed-by: Tom Stellard <[email protected]>
* scons: Don't use -z defs ld option on Mac.José Fonseca2013-07-211-1/+2
| | | | Should fix fdo bug 67098.
* scons: Disallow undefined symbols in Xlib libGL.so.José Fonseca2013-07-191-0/+3
| | | | | | | | It's not the first time that, due to missing build dependencies or incomplete commits, we end up with a broken libGL.so that's missing symbols, causing all tests to fail catastrophically. Instead try to catch this sort of issues earlier.
* libgl-xlib/build: Link with C++ when LLVM is usedMatt Turner2013-01-241-1/+9
| | | | | | Also link-in libX11 and libXext. Tested-by: Brian Paul <[email protected]>
* scons: Fix dependencies of generated headers.José Fonseca2013-01-211-3/+1
| | | | | | | | | | | | | | 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 <[email protected]>
* libgl-xlib: softpipe and llvmpipe aren't mutually exclusive at link timeJon TURNEY2013-01-151-2/+1
| | | | | | | | | | | | | | Since automake changes, softpipe and llvmpipe are mutually exclusive at link time. This doesn't make much sense to me as we can choose between them at run-time using GALLIUM_DRIVER. Creating library file: .libs/libGL.dll.a .libs/xlib.o: In function `sw_screen_create_named': /jhbuild/checkout/mesa/mesa/src/gallium/targets/libgl-xlib/../../../../src/gallium/auxiliary/target-helpers/inline_sw_helper.h:35: undefined reference to `_softpipe_create_screen' Signed-off-by: Jon TURNEY <[email protected]> Reviewed-by: Brian Paul <[email protected]>
* libgl-xlib: link with -lrtBrian Paul2013-01-141-1/+2
| | | | | | | | | | | Fixes a runtime error: glxgears: symbol lookup error: /home/brian/mesa/lib/gallium/libGL.so.1: undefined symbol: clock_gettime v2: use $(CLOCK_LIB) and $(PTHREAD_LIBS) per Andreas Boll. Reviewed-by: Matt Turner <[email protected]> Reviewed-by: Andreas Boll <[email protected]>
* Clean up .gitignore filesMatt Turner2013-01-101-1/+0
|
* targets/libgl-xlib: Convert to automakeMatt Turner2013-01-103-117/+71
| | | | | v2: Andreas Boll <[email protected]> - Provide compatibility with scripts for the old Mesa build system
* scons: Append x11 library path if linking x11 library.Vinson Lee2012-11-211-0/+1
| | | | Signed-off-by: Vinson Lee <[email protected]>
* libgl-xlib: include glheader.h instead of GL/gl.h to fix buildBrian Paul2012-11-011-1/+1
| | | | GL/gl.h doesn't define GLfixed but glapitable.h uses it.
* scons: add code to generate the various GL API filesBrian Paul2012-05-311-0/+3
| | | | | | | This fixes recent build breakage when we began building the generated API files from xml as part of the normal build process. Fixes http://bugs.freedesktop.org/show_bug.cgi?id=50475
* Revert "Always build shared glapi"Matt Turner2012-01-241-0/+2
| | | | | | | | | | | This reverts commit adefee50d954151f76150af80207081ae3c247d9. Shared glapi was never tested with --enable-xlib-glx and turns out to cause a lot of problems. Conflicts: configure.ac
* Always build shared glapiMatt Turner2012-01-201-2/+0
| | | | | | | | libglapi.so, libGL.so, libGLESv2.so, libGLESv1_CM.so must all come from the same version of Mesa or bad things may happen. Acked-by: Kenneth Graunke <[email protected]> Signed-off-by: Matt Turner <[email protected]>
* gallium/cell: Remove the driver.Kai Wasserbäch2011-11-293-9/+1
| | | | | | | Complicates Gallium3D development and doesn't seem to have active users. Signed-off-by: Kai Wasserbäch <[email protected]> Signed-off-by: José Fonseca <[email protected]>
* gallium/targets: do not link every driver with libllvmpipe.aMarek Olšák2011-07-141-0/+1
| | | | Only some targets need that, the others don't.
* scons: Generate libGL.so.1.5 and libGL.so.1 symlinks.José Fonseca2011-07-071-5/+8
| | | | In build/xxx/src/gallium/targets/libgl-xlib/SConscript
* scons: Buid libGL.so (WIP).José Fonseca2011-06-301-1/+1
|
* Remove talloc from the SCons build system.Kenneth Graunke2011-01-311-1/+0
|
* scons: Add support for GLES.Chia-I Wu2011-01-221-0/+6
| | | | | | | | | | | | | | | | | | GLES can be enabled by running scons with $ scons gles=yes When gles=yes is given, the build is changed in three ways. First, libmesa.a will be built with FEATURE_ES1 and FEATURE_ES2. This makes DRI drivers and libEGL support and advertise GLES support. Second, GLES libraries will be created. They are libGLESv1_CM, libGLESv2, and libglapi. Last, libGL or opengl32 will link to libglapi. This change is required as _glapi_* will be declared as __declspec(dllimport) in libmesa.a on windows. libmesa.a expects those symbols to be defined in another DLL. Due to this change to GL, GLES support is marked experimental. Note that GLES requires libxml2-python to generate some of its sources.
* glapi: Fix OpenGL and OpenGL ES interop.Chia-I Wu2011-01-201-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | When --enable-shared-glapi is specified, libGL will share libglapi with OpenGL ES instead of defining its own copy of glapi. This makes sure an app will get only one copy of glapi in its address space. The new option is disabled by default. When enabled, libGL and libglapi must be built from the same source tree and distributed together. This requirement comes from the fact that the dispatch offsets used by these libraries are re-assigned whenever GLAPI XMLs are changed. For GLX, indirect rendering for has_different_protocol() functions is tricky. A has_different_protocol() function is assigned only one dispatch offset, yet each entry point needs a different protocol opcode. It cannot be supported by the shared glapi. The fix to this is to make glXGetProcAddress handle such functions specially before calling _glapi_get_proc_address. Note that these files are automatically generated/re-generated src/glx/indirect.c src/glx/indirect.h src/mapi/glapi/glapi_mapi_tmp.h
* libgl-xlib: Remove unnecessary header.Vinson Lee2010-12-231-1/+0
|
* scons: Use inline wrap helpers more consistently.José Fonseca2010-11-181-6/+3
|
* libgl-xlib: Use inline debug helper instead of non-inline versionJakob Bornecrantz2010-11-173-21/+8
|
* libgl-xlib: Use sw helper instead of roll your ownJakob Bornecrantz2010-11-101-78/+12
|
* scons: Revamp how to specify targets to build.José Fonseca2010-11-011-18/+9
| | | | | | | | | | | | | | | | | | | | | | Use scons target and dependency system instead of ad-hoc options. Now is simply a matter of naming what to build. For example: scons libgl-xlib scons libgl-gdi scons graw-progs scons llvmpipe and so on. And there is also the possibility of scepcified subdirs, e.g. scons src/gallium/drivers If nothing is specified then everything will be build. There might be some rough corners over the next days. Please bare with me.
* glapi: Do not use glapidispatch.h.Chia-I Wu2010-10-271-3/+2
| | | | | | | | | glapidispatch.h exists so that core mesa (libmesa.a) can be built for DRI drivers or for non-DRI drivers as a compile time decision (whether IN_DRI_DRIVER is defined). It is of no use to glapi. This commit also drops the use of glapidispatch.h in glx and libgl-xlib as they are considered extensions to glapi when it comes to defining public GL entries.
* mesa: fix mesa version string constructionBrian Paul2010-10-191-1/+1
| | | | | Now that MESA_MINOR=10, we no longer need the extra '0' in the version string.
* libgl-xlib: Remove unused st_api_create_OpenGL.Chia-I Wu2010-09-171-8/+0
| | | | st/egl no longer relies on libGL for OpenGL support.
* libgl-xlib: Fix --enable-gallium-llvm build.Chia-I Wu2010-09-071-1/+9
| | | | Check MESA_LLVM and link to LLVM as other targets do.
* libgl-xlib: enable galahad supportBrian Paul2010-09-033-1/+18
| | | | | If the GALLIUM_GALAHAD env var is 1 we'll wrap the regular driver with the galahad validation driver.
* make: Use C++ compiler to link stdc++ library.Brian Paul2010-08-241-1/+2
| | | | | glxinfo and glxgears run on swrast and softpipe without undefined symbol errors.
* libgl-xlib: Include missing header in xlib.c.Vinson Lee2010-08-221-0/+1
| | | | Include st_api.h for st_api_create_OpenGL symbol.
* scons: Link talloc.José Fonseca2010-08-141-0/+1
|
* libgl-xlib: add depend to make clean listBrian Paul2010-07-131-1/+1
|
* rbug: Add to all targets that link against traceJakob Bornecrantz2010-05-122-0/+2
| | | | | | Also added calls to the create function in target helpers and in tr_drm.c the latter being a hack and should be replaced with the wrap screen target helper. But at least this way we don't regress.
* glapi: Move to src/mapi/.Chia-I Wu2010-05-072-1/+3
| | | | Move glapi to src/mapi/{glapi,es1api,es2api}.
* st_api: Remove st_moduleJakob Bornecrantz2010-04-261-8/+8
| | | | | | The struct st_module isn't needed as it is the same thing as the st_api struct. That is they both represent the API. Instead just use a single function entry point to the the API.
* Merge branch '7.8'Dan Nicholson2010-04-191-1/+2
| | | | | | | | Conflicts: progs/egl/Makefile progs/egl/Makefile is gone on master with the egl demos split into subdirectories. Will require an additional commit.
* scons: Always build softpipe and llvmpipe (when llvm available).José Fonseca2010-04-111-6/+2
| | | | | | | | | | These are our reference software rasterizers. They can build everywhere and are a precious debugging tool. Making them always present immensily simplifies the scons logic. If people want to avoid building it is still possible to pass direcotries and target names to scons to narrow the build.
* scons: Make LLVM a black-white dependency.José Fonseca2010-04-111-5/+3
| | | | | | | Now that draw depends on llvm it is very difficult to correctly handle broken llvm installations. Either the user requests LLVM and it needs to supply a working installation. Or it doesn't, and it gets no LLVM accelerate pipe drivers.
* libgl-xlib: Fix missing X11 symbols.José Fonseca2010-03-311-0/+2
|
* st/dri/sw: add drisw_api similarly to dri1_apiGeorge Sapountzis2010-03-291-0/+8
| | | | | I am pretty sure that this is in gallium spirit, so commit. Thanks to Chia-I for suggesting this.
* swrastg: allow for any of the software rasterizers.George Sapountzis2010-03-261-22/+42
| | | | | | | | This function should be put in targets/common or winsys/sw/common and shared with targers/libgl-xlib and winsys/sw/drm. For targets/common, you get layering violations in the build system unless all of drm_api's are moved under targets.
* gallium: Fix libgl-xlib path to sw xlib winsysJakob Bornecrantz2010-03-251-1/+1
|
* Revert "gallium: add soft screen helper"George Sapountzis2010-03-213-4/+32
| | | | This reverts commit f87a5f6499f51f651c2a9f2d4682875b22926905.
* Revert "fix scons build"George Sapountzis2010-03-211-1/+0
| | | | This reverts commit 29ec05164838f13d9535271796a50fa213d07912.
* fix scons buildGeorge Sapountzis2010-03-211-0/+1
|