From: Christian König <deathsimple@vodafone.de>
Date: Sat, 4 Jun 2011 22:11:41 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into pipe-video
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1eb957bb4108123bea95b818e0544e3b5f255e08;p=mesa.git

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

1eb957bb4108123bea95b818e0544e3b5f255e08
diff --cc configs/linux-dri
index 4f4b59dae9e,c4132f47271..e88d3f0ca72
--- a/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 src/gallium/drivers/r600/r600_state.c
index 0a1fa723e13,e9011de9fe0..46fdbfed34a
--- a/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;