Merge branch 'master' of git+ssh://agd5f@git.freedesktop.org/git/mesa/mesa into r6xx...
authorAlex Deucher <alexdeucher@gmail.com>
Wed, 15 Jul 2009 18:17:07 +0000 (14:17 -0400)
committerAlex Deucher <alexdeucher@gmail.com>
Wed, 15 Jul 2009 18:17:07 +0000 (14:17 -0400)
commitc5c19919ce627b98d8aab4284da1694573bcccd4
tree2e29b313b79b6a392e020fd5723e3cc00c800fd2
parenta0d4a12614fce072fa1eb5516e626909171c95e1
parent3a3b83e5112b725e22f05b32a273a2351b820944
Merge branch 'master' of git+ssh://agd5f@git.freedesktop.org/git/mesa/mesa into r6xx-rewrite

This builds, but I get an assertion in radeonGetLock() due to
the drawable being null.
13 files changed:
configure.ac
src/mesa/drivers/dri/r600/r600_emit.c
src/mesa/drivers/dri/r600/r600_texstate.c
src/mesa/drivers/dri/r600/r700_clear.c
src/mesa/drivers/dri/radeon/radeon_bo_drm.h
src/mesa/drivers/dri/radeon/radeon_bo_legacy.c
src/mesa/drivers/dri/radeon/radeon_common.c
src/mesa/drivers/dri/radeon/radeon_common_context.c
src/mesa/drivers/dri/radeon/radeon_common_context.h
src/mesa/drivers/dri/radeon/radeon_cs_legacy.c
src/mesa/drivers/dri/radeon/radeon_dma.c
src/mesa/drivers/dri/radeon/radeon_fbo.c
src/mesa/drivers/dri/radeon/radeon_texture.c