Commit Graph

499 Commits

Author SHA1 Message Date
Keith Whitwell 51bff09f72 mesa: fix linux-dri and autogen builds since sw-api-2 merge 2010-03-12 09:05:59 +00:00
José Fonseca 02716cf7d1 null: Add a null software winsys.
One where framebuffer data will be read via texture transfers.

Useful for e.g., python state tracker.
2010-03-09 19:47:56 +00:00
Keith Whitwell 0c96690a5b Merge commit 'origin/master' into gallium-sw-api-2
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-09 11:02:37 +00:00
Keith Whitwell 99f11d0e18 gallium: introduce target directory
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-08 19:11:35 +00:00
George Sapountzis 9009a854d1 config: drop WINDOW_SYSTEM var 2010-03-06 06:44:36 +02:00
Brian Paul 6ce4a85e0b mesa: bump version to 7.9
Now that the 7.8 branch has been created Mesa/master will be version 7.9
2010-03-05 17:35:10 -07:00
Vinson Lee e5d0956ca4 Remove ffb and gamma from configs. 2010-03-03 19:03:45 -08:00
George Sapountzis ddecefbb82 drop linux-solo configs 2010-02-26 04:02:41 +02:00
Kristian Høgsberg a9e3669683 Remove remaining miniglx references 2010-02-25 17:40:11 -05:00
Kristian Høgsberg e14a5b14b2 Drop glide driver 2010-02-25 17:40:10 -05:00
Kristian Høgsberg 4387580e50 Remove directfb support 2010-02-25 17:40:09 -05:00
Brian Paul 2d6f5dd62b cell: fix-up C, CPP flags
Flags like -Wmissing-prototypes don't apply to g++.
2010-02-12 15:25:12 -07:00
Brian Paul 8a61690e84 cell: remove -mcpu=cell from CFLAGS
This reverts part of commit ebe2f76095
and allows things to build here.
2010-02-12 15:16:44 -07:00
Brian Paul 3c28fad20b mesa: remove darwin-x86ppc and dangling darwin refs in Makefile 2010-02-11 09:04:03 -07:00
Kristian Høgsberg 6e8897ff9f Retire miniglx and move the actual glx code up to src/glx 2010-02-09 09:58:36 -05:00
Zack Rusin c61bf36393 llvmpipe: export the tgsi translation code to a common layer
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-08 18:22:11 -05:00
Marc Dietrich ebe2f76095 cell: fix the usual cell breakage
also update the cell config a bit

Signed-off-by: Brian Paul <brianp@vmware.com>
2010-02-08 07:47:04 -07:00
Kristian Høgsberg 077bc2fda2 egl_dri2: Use pkg-config cflags and libs from configure output
Running pkg-config in Makefiles is bad form, since it doesn't respect the
PKG_CONFIG_PATH value set at ./configure time.
2010-02-05 13:55:45 -05:00
Chris Li 476b668ccc allow make to build lp_test_* for llvmpipe
Signed-off-by: José Fonseca <jfonseca@vmware.com>
2010-02-05 15:34:28 +00:00
José Fonseca bee9964b29 Merge remote branch 'origin/master' into lp-binning
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-31 05:36:33 +00:00
Brian Paul f103f7e460 configs: added vega to default GALLIUM_STATE_TRACKERS_DIRS 2010-01-27 17:04:30 -07:00
Chia-I Wu 28c3e57c83 egl: Install drivers to ${libdir}/egl.
Install EGL drivers to EGL_DRIVER_INSTALL_DIR, which is default to
${libdir}/egl.
2010-01-23 20:30:11 +08:00
Chia-I Wu 3c967a9207 st/egl_g3d: Rename to st/egl.
Simply the name to egl.
2010-01-22 16:45:28 +08:00
Chia-I Wu 3b0ffd5a36 egl: Remove egl_softpipe.
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-22 16:44:13 +08:00
Chia-I Wu a1306f4ef6 winsys/drm: Add swrast.
The swrast winsys always returns NULL when drm_api_create is called.
2010-01-22 16:44:09 +08:00
Chia-I Wu 52d7b2cede st/egl: Remove the egl state tracker.
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-22 15:37:56 +08:00
Chia-I Wu 2a928899e3 egl: Remove USING_EGL and the related drivers.
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-22 15:16:31 +08:00
Chia-I Wu 324fdf7364 egl: Remove the demo driver.
The demo driver has outdated.  It is suggested to look at any of the
drivers that is functioning.
2010-01-22 15:10:09 +08:00
Chia-I Wu 5e8240320a Merge remote branch 'origin/opengl-es-v2' 2010-01-20 10:02:15 +08:00
José Fonseca ba5d600c90 Merge remote branch 'origin/master' into lp-binning
Conflicts:
	src/gallium/drivers/llvmpipe/lp_quad.h
	src/gallium/drivers/llvmpipe/lp_setup.c
2010-01-16 23:21:06 +00:00
Brian Paul 5d57e70ffa configs: remove -ansi from linux-debug
-ansi implies -std=c89 but that conflicts with the -std=c99 flag
which is also provided.

Allows the r300g driver to compile.
2010-01-15 09:02:56 -07:00
Jakob Bornecrantz 877cadb655 r300g: Build driver by default
Do the auto trick that is used for both i915, i965 and svga.
2010-01-14 22:51:25 +00:00
Chia-I Wu bffe94d48a mesa/es: Fix build issue after merge.
In cd6b8dd9e8, color read/type fields are
moved;  Based on 068596c9a7 and
cc020425e9, GLSL builtin library is
autogenerated and GLSL libraries are built and used.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2010-01-12 11:25:08 +08:00
Chia-I Wu 562c127693 Merge branch 'master' into opengl-es-v2
Conflicts:
	src/mesa/main/dd.h
2010-01-12 11:25:02 +08:00
Chia-I Wu 49381d63e6 st/egl_g3d: New EGL state tracker that uses Gallium.
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>
2010-01-12 11:08:57 +08:00
Chia-I Wu d4c1ee0534 egl: Clean up the Makefile rules.
This allows libEGL to be built as a static library and removes libX11
from the dependencies.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2010-01-11 01:11:05 +08:00
José Fonseca 080c40ab32 Merge remote branch 'origin/master' into lp-binning
Conflicts:
	src/gallium/auxiliary/util/u_surface.c
	src/gallium/drivers/llvmpipe/Makefile
	src/gallium/drivers/llvmpipe/SConscript
	src/gallium/drivers/llvmpipe/lp_bld_arit.c
	src/gallium/drivers/llvmpipe/lp_bld_flow.c
	src/gallium/drivers/llvmpipe/lp_bld_interp.c
	src/gallium/drivers/llvmpipe/lp_clear.c
	src/gallium/drivers/llvmpipe/lp_context.c
	src/gallium/drivers/llvmpipe/lp_context.h
	src/gallium/drivers/llvmpipe/lp_draw_arrays.c
	src/gallium/drivers/llvmpipe/lp_jit.c
	src/gallium/drivers/llvmpipe/lp_jit.h
	src/gallium/drivers/llvmpipe/lp_prim_vbuf.c
	src/gallium/drivers/llvmpipe/lp_setup.c
	src/gallium/drivers/llvmpipe/lp_setup_point.c
	src/gallium/drivers/llvmpipe/lp_state.h
	src/gallium/drivers/llvmpipe/lp_state_blend.c
	src/gallium/drivers/llvmpipe/lp_state_derived.c
	src/gallium/drivers/llvmpipe/lp_state_fs.c
	src/gallium/drivers/llvmpipe/lp_state_sampler.c
	src/gallium/drivers/llvmpipe/lp_state_surface.c
	src/gallium/drivers/llvmpipe/lp_tex_cache.c
	src/gallium/drivers/llvmpipe/lp_tex_cache.h
	src/gallium/drivers/llvmpipe/lp_tex_sample.h
	src/gallium/drivers/llvmpipe/lp_tile_cache.c
2010-01-08 15:42:57 +00:00
Brian Paul 251363e8f1 configs: set INTEL_LIBS, INTEL_CFLAGS, etc 2010-01-06 08:22:11 -07:00
Kristian Høgsberg 8616cec5c9 Check for libdrm_$chipset.pc when needed
This adds missing pkg-config lookup for intel and moves the radeon
lookup into a case...esac so it's only looked up when one or more of
the radeon drivers are enabled.
2010-01-04 11:47:59 -05:00
José Fonseca c978ab017d gallium: Hunt down all references to GALLIUM_AUXILIARY_DIRS. 2010-01-02 20:22:52 +00:00
Marc Dietrich 995c342018 autoconf: fix build breakage 2010-01-02 10:33:15 -07:00
José Fonseca c847a13d38 gallium: Generate a single library for auxiliaries with Make too. 2010-01-01 12:16:19 +00:00
José Fonseca fc8e0b97e5 gallium: Remove the sct module.
Not used, and its functionality is now addressed by
pipe_context::is_texture/buffer_referenced callbacks.
2010-01-01 12:16:19 +00:00
Brian Paul 25024d9482 Merge branch 'mesa_7_7_branch'
Conflicts:
	configs/darwin
	src/gallium/auxiliary/util/u_clear.h
	src/gallium/state_trackers/xorg/xorg_exa_tgsi.c
	src/mesa/drivers/dri/i965/brw_draw_upload.c
2009-12-31 09:02:27 -07:00
Brian Paul d0b7ff551a Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
Conflicts:
	src/gallium/auxiliary/util/u_network.c
	src/gallium/auxiliary/util/u_network.h
	src/gallium/drivers/i915/i915_state.c
	src/gallium/drivers/trace/tr_rbug.c
	src/gallium/state_trackers/vega/bezier.c
	src/gallium/state_trackers/vega/vg_context.c
	src/gallium/state_trackers/xorg/xorg_crtc.c
	src/gallium/state_trackers/xorg/xorg_driver.c
	src/gallium/winsys/xlib/xlib_brw_context.c
	src/mesa/main/mtypes.h
2009-12-27 15:31:08 -07:00
Brian Paul cb504a026c cell: add glsl to SRC_DIRS 2009-12-27 10:24:12 -07:00
Vinson Lee 19a40524d3 Add gallium to darwin config. 2009-12-22 18:21:41 -08:00
Keith Whitwell aa02683e45 Merge branch 'i965g-restart'
Conflicts:
	configure.ac
2009-12-22 09:40:39 +00:00
Jeremy Huddleston 3839f6768d darwin: Build glsl
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
2009-12-21 17:49:44 -08:00
Keith Whitwell 57531baa92 i965g: back out unintentional changes to linux-dri 2009-12-21 19:21:09 +00:00