summaryrefslogtreecommitdiff
path: root/configs
AgeCommit message (Collapse)AuthorFilesLines
2010-04-05mesa: bump MESA_TINY versionBrian Paul1-1/+1
2010-04-01Revert accidental commits from the xquartz treeJeremy Huddleston1-5/+2
This reverts commit 9aadc793f3db64cefa0b08f18abad424a659dacc. This reverts commit 69ea4e7718efb60b6b0d795a355cebd6712ceac1. This reverts commit dbe8b013936d977ec63d6607bfd2fc6772d29787. This reverts commit 23215ef4d60a86d9f3b3fdc08e3fdadc59e98890. This reverts commit 9495e3703062d1ddaf3161f4efc23f0b51284d9b. This reverts commit 0594cf70883b64692ba617d85f4f9b4e636e5c2b. This reverts commit 86a7978d37393ee34f876569ac06ffdb8d7289ae. This reverts commit 437902ce978cde9a0e1aa260f12dc232a8501c42.
2010-04-01progs: Fix linking of Xlib demos for non-autoconf buildsDan Nicholson1-1/+1
The Xlib demos were fixed to use $(X11_LIBS) so that configure could detect the proper directory to link the library from, but this broke the non-autoconf builds. Give X11_LIBS a default value to fallback on.
2010-04-01apple: Don't build galliumJeremy Huddleston1-1/+1
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2010-04-01apple: Integrate our libGL into the existing build system betterJeremy Huddleston1-2/+5
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2010-04-01progs/es: Move OpenGL ES demos to subdirectories of progs/egl.Chia-I Wu1-1/+1
Move progs/es1/xegl -> progs/egl/opengles1, progs/es1/screen -> progs/egl/opengles1/screen, progs/es2/xegl -> progs/egl/opengles2.
2010-04-01progs/egl: Move demos a level deeper.Chia-I Wu2-2/+2
Move the demos to "opengl" subdirectory.
2010-03-26auto detect llvm versionChris Li1-0/+2
2010-03-24gallium: Reorg winsys directoriesJakob Bornecrantz2-2/+2
Attached output from commit. delete mode 100644 src/gallium/winsys/drm/SConscript delete mode 100644 src/gallium/winsys/drm/i965/SConscript delete mode 100644 src/gallium/winsys/drm/intel/Makefile delete mode 100644 src/gallium/winsys/drm/intel/SConscript delete mode 100644 src/gallium/winsys/drm/nouveau/Makefile delete mode 100644 src/gallium/winsys/drm/radeon/Makefile delete mode 100644 src/gallium/winsys/drm/radeon/SConscript delete mode 100644 src/gallium/winsys/drm/vmware/Makefile delete mode 100644 src/gallium/winsys/drm/vmware/SConscript rename src/gallium/winsys/{drm/intel/gem => i915/drm}/Makefile (82%) rename src/gallium/winsys/{drm/intel/gem => i915/drm}/SConscript (100%) rename src/gallium/winsys/{drm/intel/gem => i915/drm}/intel_drm_api.c (100%) rename src/gallium/winsys/{drm/intel/gem => i915/drm}/intel_drm_batchbuffer.c (100%) rename src/gallium/winsys/{drm/intel/gem => i915/drm}/intel_drm_buffer.c (100%) rename src/gallium/winsys/{drm/intel/gem => i915/drm}/intel_drm_fence.c (100%) rename src/gallium/winsys/{drm/intel/gem => i915/drm}/intel_drm_winsys.h (100%) rename src/gallium/winsys/{drm/i965/gem => i965/drm}/Makefile (78%) rename src/gallium/winsys/{drm/i965/gem => i965/drm}/SConscript (100%) rename src/gallium/winsys/{drm/i965/gem => i965/drm}/i965_drm_api.c (98%) rename src/gallium/winsys/{drm/i965/gem => i965/drm}/i965_drm_buffer.c (100%) rename src/gallium/winsys/{drm/i965/gem => i965/drm}/i965_drm_winsys.h (100%) rename src/gallium/winsys/{drm => }/i965/xlib/Makefile (97%) rename src/gallium/winsys/{drm => }/i965/xlib/xlib_i965.c (100%) rename src/gallium/winsys/{drm => }/nouveau/drm/Makefile (79%) rename src/gallium/winsys/{drm => }/nouveau/drm/nouveau_dri.h (100%) rename src/gallium/winsys/{drm => }/nouveau/drm/nouveau_drm_api.c (100%) rename src/gallium/winsys/{drm => }/nouveau/drm/nouveau_drm_api.h (100%) rename src/gallium/winsys/{drm/radeon/core => radeon/drm}/Makefile (79%) rename src/gallium/winsys/{drm/radeon/core => radeon/drm}/SConscript (100%) rename src/gallium/winsys/{drm/radeon/core => radeon/drm}/radeon_buffer.h (100%) rename src/gallium/winsys/{drm/radeon/core => radeon/drm}/radeon_drm.c (100%) rename src/gallium/winsys/{drm/radeon/core => radeon/drm}/radeon_drm.h (100%) rename src/gallium/winsys/{drm/radeon/core => radeon/drm}/radeon_drm_buffer.c (100%) rename src/gallium/winsys/{drm/radeon/core => radeon/drm}/radeon_r300.c (100%) rename src/gallium/winsys/{drm/radeon/core => radeon/drm}/radeon_r300.h (100%) rename src/gallium/winsys/{drm/radeon/core => radeon/drm}/radeon_winsys.h (100%) rename src/gallium/winsys/{drm/vmware/core => svga/drm}/Makefile (63%) rename src/gallium/winsys/{drm/vmware/core => svga/drm}/SConscript (100%) rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_buffer.c (100%) rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_buffer.h (100%) rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_context.c (100%) rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_context.h (100%) rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_fence.c (100%) rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_fence.h (100%) rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_screen.c (100%) rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_screen.h (100%) rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_screen_dri.c (100%) rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_screen_ioctl.c (100%) rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_screen_pools.c (100%) rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_screen_svga.c (100%) rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_surface.c (100%) rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_surface.h (100%) rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmwgfx_drm.h (100%) rename src/gallium/winsys/{drm/i965 => sw}/Makefile (61%) copy src/gallium/winsys/{drm/sw => sw/drm}/Makefile (73%) rename src/gallium/winsys/{drm/sw => sw/drm}/sw_drm_api.c (98%) rename src/gallium/winsys/{drm/sw => sw/drm}/sw_drm_api.h (100%) rename src/gallium/winsys/{ => sw}/gdi/SConscript (100%) rename src/gallium/winsys/{ => sw}/gdi/gdi_sw_winsys.c (100%) rename src/gallium/winsys/{ => sw}/gdi/gdi_sw_winsys.h (100%) rename src/gallium/winsys/{ => sw}/null/Makefile (78%) rename src/gallium/winsys/{ => sw}/null/SConscript (100%) rename src/gallium/winsys/{ => sw}/null/null_sw_winsys.c (100%) rename src/gallium/winsys/{ => sw}/null/null_sw_winsys.h (100%) rename src/gallium/winsys/{drm/sw => sw/wrapper}/Makefile (65%) rename src/gallium/winsys/{drm/sw => sw/wrapper}/wrapper_sw_winsys.c (100%) rename src/gallium/winsys/{drm/sw => sw/wrapper}/wrapper_sw_winsys.h (100%) rename src/gallium/winsys/{ => sw}/xlib/Makefile (79%) rename src/gallium/winsys/{ => sw}/xlib/SConscript (100%) rename src/gallium/winsys/{ => sw}/xlib/xlib_sw_winsys.c (100%)
2010-03-24gallium: Move egl drivers to targetsJakob Bornecrantz3-3/+4
Atteched output from git commit: rename src/gallium/{winsys/drm => targets}/Makefile.egl (100%) rename src/gallium/{winsys/drm/intel/egl => targets/egl-i915}/Makefile (86%) rename src/gallium/{winsys/drm/i965/egl => targets/egl-i915}/dummy.c (100%) rename src/gallium/{winsys/drm/i965/egl => targets/egl-i965}/Makefile (86%) rename src/gallium/{winsys/drm/intel/egl => targets/egl-i965}/dummy.c (100%) rename src/gallium/{winsys/drm/nouveau/egl => targets/egl-nouveau}/Makefile (88%) rename src/gallium/{winsys/drm/nouveau/egl => targets/egl-nouveau}/dummy.c (100%) rename src/gallium/{winsys/drm/radeon/egl => targets/egl-radeon}/Makefile (87%) rename src/gallium/{winsys/drm/radeon/egl => targets/egl-radeon}/dummy.c (100%) create mode 100644 src/gallium/targets/egl-swrast/Makefile create mode 100644 src/gallium/targets/egl-swrast/swrast_glue.c rename src/gallium/{winsys/drm/vmware/egl => targets/egl-vmwgfx}/Makefile (86%) rename src/gallium/{winsys/drm/swrast/egl => targets/egl-vmwgfx}/dummy.c (100%) delete mode 100644 src/gallium/winsys/drm/swrast/Makefile delete mode 100644 src/gallium/winsys/drm/swrast/core/Makefile delete mode 100644 src/gallium/winsys/drm/swrast/core/swrast_drm_api.c delete mode 100644 src/gallium/winsys/drm/swrast/egl/Makefile delete mode 100644 src/gallium/winsys/drm/vmware/egl/dummy.c
2010-03-24gallium: Remove GALLIUM_WINSYS_DRM_DIRSJakob Bornecrantz4-7/+3
2010-03-23Change libX11 variables to not conflict with AC_PATH_XTRADan Nicholson1-2/+2
The variable X_LIBS from AC_PATH_XTRA contains only the -L searchdir parameter and not the -lX11 to link to Xlib. Use X11 prefixed build vars for linking with Xlib to avoid the conflict. Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
2010-03-17llvmpipe: remove -m32 flag from linux-llvm configBrian Paul1-1/+1
2010-03-16cell: build identity driver tooBrian Paul1-1/+1
2010-03-13Use X_LIBS from pkg-config, instead of libdir, for locating libX11Jeff Smith1-0/+2
Signed-off-by: Jeff Smith <whydoubt@yahoo.com> Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
2010-03-12mesa: fix linux-dri and autogen builds since sw-api-2 mergeKeith Whitwell2-2/+2
2010-03-09null: Add a null software winsys.José Fonseca1-1/+1
One where framebuffer data will be read via texture transfers. Useful for e.g., python state tracker.
2010-03-09Merge commit 'origin/master' into gallium-sw-api-2Keith Whitwell7-8/+1
Conflicts: src/gallium/drivers/llvmpipe/lp_setup.c src/gallium/drivers/softpipe/sp_texture.c src/gallium/drivers/softpipe/sp_winsys.h src/gallium/state_trackers/egl/common/egl_g3d.c src/gallium/state_trackers/egl/x11/native_x11.c src/gallium/state_trackers/egl/x11/native_x11.h src/gallium/state_trackers/egl/x11/native_ximage.c
2010-03-08gallium: introduce target directoryKeith Whitwell7-4/+9
Currently there are still at least two functions bundled up inside the winsys concept: a) that of a backend resource manager, sometimes capable of performing present() operations, b) the initialization code/routine for the whole driver stack. The inclusion of (b) makes it difficult to share implementations of (a) between different drivers. For instance, a clean xlib winsys could be of use for software-rasterized VG, GLES, EGL, etc, stacks. But that is only true as long as there is no dependency from the winsys to higher level code, as would be the case when we include (b) in this component. This change creates a new gallium/targets subtree, specifically for implementing the glue needed to build individual driver stacks, and moves that code out of a single example winsys, namely xlib. Other drivers continue to build unchanged, but hopefully can migrate to this structure over time.
2010-03-06config: drop WINDOW_SYSTEM varGeorge Sapountzis6-7/+0
2010-03-05mesa: bump version to 7.9Brian Paul1-1/+1
Now that the 7.8 branch has been created Mesa/master will be version 7.9
2010-03-03Remove ffb and gamma from configs.Vinson Lee5-9/+3
2010-02-26drop linux-solo configsGeorge Sapountzis2-17/+0
2010-02-25Remove remaining miniglx referencesKristian Høgsberg1-54/+0
2010-02-25Drop glide driverKristian Høgsberg2-51/+0
2010-02-25Remove directfb supportKristian Høgsberg1-38/+0
2010-02-12cell: fix-up C, CPP flagsBrian Paul1-3/+7
Flags like -Wmissing-prototypes don't apply to g++.
2010-02-12cell: remove -mcpu=cell from CFLAGSBrian Paul1-1/+1
This reverts part of commit ebe2f7609533645e7e9c8af4a55bc0127b9bc515 and allows things to build here.
2010-02-11mesa: remove darwin-x86ppc and dangling darwin refs in MakefileBrian Paul1-33/+0
2010-02-09Retire miniglx and move the actual glx code up to src/glxKristian Høgsberg5-6/+6
2010-02-08llvmpipe: export the tgsi translation code to a common layerZack Rusin1-1/+1
the llvmpipe tgsi translation is a lot more complete than what was in gallivm so replacing the latter with the former. this is needed since the draw llvm paths will use the same code. effectively the proven llvmpipe code becomes gallivm.
2010-02-08cell: fix the usual cell breakageMarc Dietrich1-3/+3
also update the cell config a bit Signed-off-by: Brian Paul <brianp@vmware.com>
2010-02-05egl_dri2: Use pkg-config cflags and libs from configure outputKristian Høgsberg1-0/+3
Running pkg-config in Makefiles is bad form, since it doesn't respect the PKG_CONFIG_PATH value set at ./configure time.
2010-02-05allow make to build lp_test_* for llvmpipeChris Li1-1/+1
Signed-off-by: José Fonseca <jfonseca@vmware.com>
2010-01-31Merge remote branch 'origin/master' into lp-binningJosé Fonseca6-25/+39
Conflicts: Makefile src/gallium/auxiliary/util/u_surface.c src/gallium/drivers/llvmpipe/lp_flush.c src/gallium/drivers/llvmpipe/lp_setup.c src/gallium/drivers/llvmpipe/lp_state_derived.c src/gallium/drivers/llvmpipe/lp_state_fs.c src/gallium/drivers/llvmpipe/lp_state_surface.c src/gallium/drivers/llvmpipe/lp_tex_cache.c src/gallium/drivers/llvmpipe/lp_texture.c src/gallium/drivers/llvmpipe/lp_tile_cache.c src/mesa/state_tracker/st_cb_condrender.c
2010-01-27configs: added vega to default GALLIUM_STATE_TRACKERS_DIRSBrian Paul1-1/+1
2010-01-23egl: Install drivers to ${libdir}/egl.Chia-I Wu2-0/+6
Install EGL drivers to EGL_DRIVER_INSTALL_DIR, which is default to ${libdir}/egl.
2010-01-22st/egl_g3d: Rename to st/egl.Chia-I Wu2-3/+3
Simply the name to egl.
2010-01-22egl: Remove egl_softpipe.Chia-I Wu2-6/+4
With the addition egl_x11_swrast, egl_softpipe is sort of deprecated. The new driver serves the same purpose as egl_softpipe does. It is based on egl_g3d and provides more features.
2010-01-22winsys/drm: Add swrast.Chia-I Wu1-2/+2
The swrast winsys always returns NULL when drm_api_create is called.
2010-01-22st/egl: Remove the egl state tracker.Chia-I Wu2-2/+5
The egl_g3d state tracker has support for KMS, and the support is based on the egl state tracker. As egl_g3d provides more features, it should be better to keep only egl_g3d to unify the efforts.
2010-01-22egl: Remove USING_EGL and the related drivers.Chia-I Wu3-20/+0
They do not build for a long while and there seems to be no active users. It might be better for them to live in the git histroy.
2010-01-22egl: Remove the demo driver.Chia-I Wu2-2/+2
The demo driver has outdated. It is suggested to look at any of the drivers that is functioning.
2010-01-20Merge remote branch 'origin/opengl-es-v2'Chia-I Wu1-0/+27
2010-01-16Merge remote branch 'origin/master' into lp-binningJosé Fonseca3-3/+12
Conflicts: src/gallium/drivers/llvmpipe/lp_quad.h src/gallium/drivers/llvmpipe/lp_setup.c
2010-01-15configs: remove -ansi from linux-debugBrian Paul1-1/+1
-ansi implies -std=c89 but that conflicts with the -std=c99 flag which is also provided. Allows the r300g driver to compile.
2010-01-14r300g: Build driver by defaultJakob Bornecrantz1-1/+1
Do the auto trick that is used for both i915, i965 and svga.
2010-01-12mesa/es: Fix build issue after merge.Chia-I Wu1-1/+1
In cd6b8dd9e82fedc55d033131fbc0f8ee950567c8, color read/type fields are moved; Based on 068596c9a7e8d330ffdff8ad8700bd6093b5bdea and cc020425e929110613ddb405d3e82313d27a35ed, GLSL builtin library is autogenerated and GLSL libraries are built and used. Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2010-01-12Merge branch 'master' into opengl-es-v2Chia-I Wu9-20/+42
Conflicts: src/mesa/main/dd.h
2010-01-12st/egl_g3d: New EGL state tracker that uses Gallium.Chia-I Wu2-0/+3
This new (intermediate) EGL state tracker is the base work for EGL drivers that uses Gallium. It makes it easier to support new window systems. Currently, there is support only for X11. This driver supports multiple APIs (OpenVG, OpenGL, ...) and supports hardware acceleration through winsys/drm. Signed-off-by: Chia-I Wu <olvaffe@gmail.com>