Merge remote-tracking branch 'origin/master' into pipe-video

diff --cc configs/autoconf.in
Simple merge

diff --cc configs/linux-dri
index 4f4b59dae9ed00785d73a73afb4710746d958456,c4132f47271cf021fb8c6f3b6662ce470f0d1bb8..e88d3f0ca725e88303f1cb8d31351d313429f351
--- 1/configs/linux-dri
--- 2/configs/linux-dri
+++ b/configs/linux-dri
@@@ -59,16 -59,20 +59,21 @@@ SRC_DIRS := glx egl $(SRC_DIRS
  EGL_DRIVERS_DIRS = glx
  
  DRIVER_DIRS = dri
 +
  GALLIUM_WINSYS_DIRS = sw sw/xlib drm/vmware drm/intel drm/i965
 -GALLIUM_TARGET_DIRS = 
 -GALLIUM_STATE_TRACKERS_DIRS = egl
 +GALLIUM_TARGET_DIRS = egl-swrast
 +GALLIUM_STATE_TRACKERS_DIRS = egl vdpau
  
- DRI_DIRS = i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon \
+ DRI_DIRS = i810 i915 i965 mach64 mga nouveau r128 r200 r300 r600 radeon \
        savage sis tdfx unichrome swrast
  
- INTEL_LIBS = `pkg-config --libs libdrm_intel`
- INTEL_CFLAGS = `pkg-config --cflags libdrm_intel`
+ INTEL_LIBS = $(shell pkg-config --libs libdrm_intel)
+ INTEL_CFLAGS = $(shell pkg-config --cflags libdrm_intel)
  
- RADEON_LIBS = `pkg-config --libs libdrm_radeon`
- RADEON_CFLAGS = `pkg-config --cflags libdrm_radeon`
+ NOUVEAU_LIBS = $(shell pkg-config --libs libdrm_nouveau)
+ NOUVEAU_CFLAGS = $(shell pkg-config --cflags libdrm_nouveau)
+ 
+ LIBDRM_RADEON_LIBS = $(shell pkg-config --libs libdrm_radeon)
+ LIBDRM_RADEON_CFLAGS = $(shell pkg-config --cflags libdrm_radeon)
+ RADEON_CFLAGS = "-DHAVE_LIBDRM_RADEON=1 $(LIBDRM_RADEON_CFLAGS)"
+ RADEON_LDFLAGS = $(LIBDRM_RADEON_LIBS)

diff --cc configure.ac
Simple merge

diff --cc src/gallium/drivers/r600/r600_pipe.c
Simple merge

diff --cc src/gallium/drivers/r600/r600_state.c
index 0a1fa723e131917016e2b14140891fe915765e7c,e9011de9fe05795125ac90f44d843eb042fcd8e2..46fdbfed34ad75b829fa6b44ee6394c106c6737c
--- 1/src/gallium/drivers/r600/r600_state.c
--- 2/src/gallium/drivers/r600/r600_state.c
+++ b/src/gallium/drivers/r600/r600_state.c
@@@ -286,9 -287,10 +287,10 @@@ static void *r600_create_dsa_state(stru
  static void *r600_create_rs_state(struct pipe_context *ctx,
                                        const struct pipe_rasterizer_state *state)
  {
+       struct r600_pipe_context *rctx = (struct r600_pipe_context *)ctx;
        struct r600_pipe_rasterizer *rs = CALLOC_STRUCT(r600_pipe_rasterizer);
        struct r600_pipe_state *rstate;
 -      unsigned tmp;
 +      unsigned tmp, cb;
        unsigned prov_vtx = 1, polygon_dual_mode;
        unsigned clip_rule;
  

diff --cc src/gallium/winsys/r600/drm/r600_hw_context.c
Simple merge

diff --cc src/mesa/state_tracker/st_format.c
Simple merge