summaryrefslogtreecommitdiffstats
path: root/src/gallium/targets
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/master' into pipe-videoChristian König2011-04-234-8/+8
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configs/linux-dri src/gallium/drivers/r600/r600_pipe.c src/gallium/drivers/r600/r600_state.c src/gallium/include/pipe/p_format.h src/gallium/tests/graw/fragment-shader/frag-abs.sh src/gallium/tests/graw/fragment-shader/frag-add.sh src/gallium/tests/graw/fragment-shader/frag-cb-1d.sh src/gallium/tests/graw/fragment-shader/frag-cb-2d.sh src/gallium/tests/graw/fragment-shader/frag-dp3.sh src/gallium/tests/graw/fragment-shader/frag-dp4.sh src/gallium/tests/graw/fragment-shader/frag-dst.sh src/gallium/tests/graw/fragment-shader/frag-ex2.sh src/gallium/tests/graw/fragment-shader/frag-face.sh src/gallium/tests/graw/fragment-shader/frag-flr.sh src/gallium/tests/graw/fragment-shader/frag-frc.sh src/gallium/tests/graw/fragment-shader/frag-kil.sh src/gallium/tests/graw/fragment-shader/frag-lg2.sh src/gallium/tests/graw/fragment-shader/frag-lit.sh src/gallium/tests/graw/fragment-shader/frag-lrp.sh src/gallium/tests/graw/fragment-shader/frag-mad-immx.sh src/gallium/tests/graw/fragment-shader/frag-mad.sh src/gallium/tests/graw/fragment-shader/frag-max.sh src/gallium/tests/graw/fragment-shader/frag-min.sh src/gallium/tests/graw/fragment-shader/frag-mov.sh src/gallium/tests/graw/fragment-shader/frag-mul.sh src/gallium/tests/graw/fragment-shader/frag-rcp.sh src/gallium/tests/graw/fragment-shader/frag-rsq.sh src/gallium/tests/graw/fragment-shader/frag-sge.sh src/gallium/tests/graw/fragment-shader/frag-slt.sh src/gallium/tests/graw/fragment-shader/frag-srcmod-abs.sh src/gallium/tests/graw/fragment-shader/frag-srcmod-absneg.sh src/gallium/tests/graw/fragment-shader/frag-srcmod-neg.sh src/gallium/tests/graw/fragment-shader/frag-srcmod-swz.sh src/gallium/tests/graw/fragment-shader/frag-sub.sh src/gallium/tests/graw/fragment-shader/frag-tempx.sh src/gallium/tests/graw/fragment-shader/frag-xpd.sh src/gallium/tests/graw/vertex-shader/vert-abs.sh src/gallium/tests/graw/vertex-shader/vert-add.sh src/gallium/tests/graw/vertex-shader/vert-arl.sh src/gallium/tests/graw/vertex-shader/vert-arr.sh src/gallium/tests/graw/vertex-shader/vert-cb-1d.sh src/gallium/tests/graw/vertex-shader/vert-cb-2d.sh src/gallium/tests/graw/vertex-shader/vert-dp3.sh src/gallium/tests/graw/vertex-shader/vert-dp4.sh src/gallium/tests/graw/vertex-shader/vert-dst.sh src/gallium/tests/graw/vertex-shader/vert-ex2.sh src/gallium/tests/graw/vertex-shader/vert-flr.sh src/gallium/tests/graw/vertex-shader/vert-frc.sh src/gallium/tests/graw/vertex-shader/vert-lg2.sh src/gallium/tests/graw/vertex-shader/vert-lit.sh src/gallium/tests/graw/vertex-shader/vert-lrp.sh src/gallium/tests/graw/vertex-shader/vert-mad.sh src/gallium/tests/graw/vertex-shader/vert-max.sh src/gallium/tests/graw/vertex-shader/vert-min.sh src/gallium/tests/graw/vertex-shader/vert-mov.sh src/gallium/tests/graw/vertex-shader/vert-mul.sh src/gallium/tests/graw/vertex-shader/vert-rcp.sh src/gallium/tests/graw/vertex-shader/vert-rsq.sh src/gallium/tests/graw/vertex-shader/vert-sge.sh src/gallium/tests/graw/vertex-shader/vert-slt.sh src/gallium/tests/graw/vertex-shader/vert-srcmod-abs.sh src/gallium/tests/graw/vertex-shader/vert-srcmod-absneg.sh src/gallium/tests/graw/vertex-shader/vert-srcmod-neg.sh src/gallium/tests/graw/vertex-shader/vert-srcmod-swz.sh src/gallium/tests/graw/vertex-shader/vert-sub.sh src/gallium/tests/graw/vertex-shader/vert-xpd.sh src/gallium/tools/trace/dump.py src/gallium/tools/trace/format.py src/gallium/tools/trace/model.py src/gallium/tools/trace/parse.py
| * r300g/winsys: rename r300->radeon and do a little cleanupMarek Olšák2011-04-184-8/+8
| | | | | | | | | | Renaming a few files, types, and functions. Also make the winsys independent of r300g.
* | Merge remote branch 'origin/master' into pipe-videoChristian König2011-03-191-1/+3
|\| | | | | | | | | | | Conflicts: src/gallium/drivers/r600/r600_asm.c src/gallium/tests/unit/SConscript
| * graw-gdi: Silence gcc missing initialization warning.José Fonseca2011-03-061-1/+3
| |
* | vdpau: add vdpau-r600 targetChristian König2011-03-193-0/+45
| |
* | [g3dvl] move mpeg12 context out of softpipeChristian König2011-03-171-1/+0
| |
* | Merge remote branch 'origin/master' into pipe-videoChristian König2011-02-2410-16/+30
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac src/gallium/auxiliary/Makefile src/gallium/auxiliary/SConscript src/gallium/drivers/r600/r600_asm.c src/gallium/drivers/r600/r600_asm.h src/gallium/drivers/r600/r600_shader.c src/gallium/drivers/r600/r600_state_inlines.h src/gallium/drivers/r600/r600_texture.c
| * r300g: import the last bits of libdrm and cleanup the whole thingMarek Olšák2011-02-116-9/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Based on Dave's branch. The majority of this commit is a cleanup, mainly renaming things. There wasn't much code to import, just ioctl calls. Also done: - implemented unsynchronized bo_map (important optimization!) - radeon_bo_is_referenced_by_cs is no longer a refcount hack - dropped the libdrm_radeon dependency I'm surprised that this has resulted in less code in the end.
| * st/egl: Add wayland platformBenjamin Franzke2011-02-071-0/+3
| |
| * Remove talloc from the SCons build system.Kenneth Graunke2011-01-314-4/+1
| |
| * svga: link libwsw for dri-vmwgfx target with make build system tooRoland Scheidegger2011-01-251-0/+1
| |
| * scons: Add support for GLES.Chia-I Wu2011-01-223-4/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Merge remote branch 'origin/master' into pipe-videoChristian König2011-01-203-4/+26
|\| | | | | | | | | Conflicts: src/gallium/drivers/r600/r600_asm.c
| * graw: fix logic error in pixel format selectionBrian Paul2011-01-201-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The loop to choose a pixel format for the window was incrementing 'i' after we succeeded in creating the window so if we chose format[0] for graw_create_window_and_screen() we were putting format[1] in the pipe_resource template for creating the render target. This only worked because of the order of the elements in the formats[] array. The graw_xlib.c code now properly compares the requested gallium pixel format against the visual's color layout. Update all the graw demos to fix the off-by-one-i error.
| * glapi: Fix OpenGL and OpenGL ES interop.Chia-I Wu2011-01-202-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge remote branch 'origin/master' into pipe-videoChristian König2011-01-208-124/+583
|\| | | | | | | | | | | Conflicts: src/gallium/drivers/r600/r600_asm.c src/gallium/drivers/r600/r600_shader.c
| * targets/egl-static: Assorted cleanups and fixes.Chia-I Wu2011-01-151-12/+12
| | | | | | | | | | | | Share more code between windows and non-windows platforms. Check env['x11'] for X11 and add env['X11_LIBS'] to LIBS. Add ws_wrapper for i965g.
| * targets/egl: i965 needs libwsw.Chia-I Wu2011-01-151-1/+2
| | | | | | | | Fix undefined symbol wrapper_sw_winsys_dewrap_pipe_screen.
| * targets/egl-static: Remove unnecessary header.Vinson Lee2011-01-131-1/+0
| |
| * scons: Ensure the OpenVG/EGL import libs are also prefixed with 'lib'.José Fonseca2011-01-131-0/+1
| |
| * scons: Build libOpenVG.dll & libEGL.dllJosé Fonseca2011-01-131-1/+4
| | | | | | | | | | | | But without creating liblibOpenVG or liblibEGL elsewhere. Thanks Chia-I Wu for pointing this out.
| * scons: Update windows build for vgapi->openvg rename.José Fonseca2011-01-121-1/+1
| |
| * scons: Fix build on systems without libOpenVG.soJosé Fonseca2011-01-121-1/+2
| |
| * scons: Updates for targets/egl-static.Chia-I Wu2011-01-121-0/+122
| | | | | | | | | | | | | | | | Update SConscripts to re-enable or add support for EGL on windows and x11 platforms respectively. targets/egl-gdi is replaced by targets/egl-static, where "-static" means pipe drivers and state trackers are linked to statically by egl_gallium, and egl_gallium is a built-in driver of libEGL. There is no more egl_gallium.dll on Windows.
| * targets/egl-static: New EGL target for scons.Chia-I Wu2011-01-126-123/+455
| | | | | | | | | | This target is based on and replaces egl-gdi. It is suitable for both windows and x11.
* | Merge remote branch 'origin/master' into pipe-videoChristian König2011-01-129-183/+7
|\| | | | | | | | | Conflicts: src/gallium/drivers/r600/r600_shader.c
| * noop: remove dead dri targetJerome Glisse2011-01-113-128/+0
| | | | | | | | Signed-off-by: Jerome Glisse <[email protected]>
| * mesa: Remove GLES overlay.Chia-I Wu2011-01-104-52/+2
| | | | | | | | | | | | | | With core mesa doing runtime API checks, GLES overlay is no longer needed. Make --enable-gles-overlay equivalent to --enable-gles[12]. There may still be places where compile-time checks are done. They could be fixed case by case.
| * noop: make noop useable like trace or rbugJerome Glisse2011-01-092-3/+4
| | | | | | | | | | | | | | | | If you want to enable noop set GALLIUM_NOOP=1 as an env variable. You need first to enable noop wrapping for your driver see change to src/gallium/targets/dri-r600/ in this commit as an example. Signed-off-by: Jerome Glisse <[email protected]>
| * targets/egl: add libnvc0.a to nouveau libsMarcin Slusarz2011-01-091-0/+1
| |
* | Merge remote branch 'vdpau/pipe-video' into pipe-videoChristian König2011-01-109-11/+147
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.c src/gallium/drivers/softpipe/sp_video_context.c src/gallium/include/pipe/p_format.h src/gallium/state_trackers/xorg/xvmc/context.c src/gallium/tests/unit/SConscript
| * | vl: rest of va stubsThomas Balling Sørensen2010-10-282-0/+50
| | |
| * | vl: enable target va-r600Thomas Balling Sørensen2010-10-282-0/+83
| | |
| * | vl: creating cleaner way of naming librariesThomas Balling Sørensen2010-10-264-5/+6
| | |
| * | vl: fix some build issues after the mergeThomas Balling Sørensen2010-10-261-4/+5
| | |
| * | Merge branch 'pipe-video' of ↵Thomas Balling Sørensen2010-10-263-0/+48
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://anongit.freedesktop.org/~deathsimple/xvmc-r600 into pipe-video Conflicts: configure.ac src/gallium/auxiliary/vl/vl_compositor.c src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.c src/gallium/drivers/softpipe/sp_video_context.c src/gallium/include/pipe/p_defines.h src/gallium/include/pipe/p_screen.h
| * \ \ Merge branch 'master' into pipe-videoThomas Balling Sørensen2010-10-2612-33/+34
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/include/pipe/p_format.h
| * \ \ \ Merge branch 'master' into pipe-videoThomas Balling Sørensen2010-10-0584-566/+2845
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configs/linux-dri configure.ac src/gallium/drivers/nvfx/Makefile src/gallium/include/pipe/p_defines.h src/gallium/include/pipe/p_screen.h src/gallium/include/state_tracker/dri1_api.h src/gallium/include/state_tracker/drm_api.h src/gallium/tests/python/samples/tri.py src/gallium/tests/trivial/Makefile src/gallium/tests/unit/Makefile src/gallium/tests/unit/SConscript src/gallium/tests/unit/u_format_test.c src/gallium/winsys/nouveau/drm/nouveau_drm_api.c
| * | | | | vdpau changesThomas Balling Sørensen2010-07-141-4/+5
| | | | | |
* | | | | | Merge remote branch 'origin/master' into pipe-videoChristian König2011-01-085-5/+9
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac src/gallium/drivers/r600/eg_asm.c src/gallium/drivers/r600/r600_asm.c src/gallium/drivers/r600/r600_asm.h src/gallium/include/pipe/p_format.h src/gallium/targets/dri-nouveau/Makefile
| * | | | | Merge remote branch 'origin/nvc0'Christoph Bumiller2011-01-041-0/+1
| |\ \ \ \ \
| | * \ \ \ \ Merge remote branch 'origin/master' into nvc0-newChristoph Bumiller2010-12-1915-192/+260
| | |\ \ \ \ \
| | * | | | | | nvc0: import nvc0 gallium driverChristoph Bumiller2010-11-121-0/+1
| | | | | | | |
| * | | | | | | graw: Include p_shader_tokens.h for tgsi_token struct.Vinson Lee2010-12-301-0/+1
| | | | | | | |
| * | | | | | | svga: Fix newline at EOFJakob Bornecrantz2010-12-161-1/+1
| | | | | | | |
| * | | | | | | svga: Add Galahad and Softpipe to scons buildJakob Bornecrantz2010-12-162-3/+6
| | | | | | | |
| * | | | | | | libgl-xlib: Remove unnecessary header.Vinson Lee2010-12-231-1/+0
| | |/ / / / / | |/| | | | |
* | | | | | | Merge remote branch 'origin/master' into pipe-videoChristian König2010-12-113-9/+46
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/drivers/r600/r600_pipe.c src/gallium/drivers/r600/r600_texture.c
| * | | | | | targets/egl: Improve st_GL.so loading.Chia-I Wu2010-12-101-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the application is not linked to any libGL*.so, loading st_GL.so would give /usr/local/lib/egl/st_GL.so: undefined symbol: _glapi_tls_Context In that case, load libGL.so and try again. This works because util_dl_open loads with RTLD_GLOBAL. Fix "clear" OpenGL ES 1.1 demo.
| * | | | | | target/egl: Fix misleading debug message.Chia-I Wu2010-12-101-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the name of the module is NULL, the process itself is dlopen()ed. Do not print libEGL debug: searching for st module (null)