dri: Merge drisw_util.c into dri_util.c
authorEric Anholt <eric@anholt.net>
Thu, 26 Sep 2013 18:35:31 +0000 (11:35 -0700)
committerEric Anholt <eric@anholt.net>
Thu, 10 Oct 2013 23:34:30 +0000 (16:34 -0700)
commitd81632fb1e809a0b1ee9310ae3a4733a1c0651b7
tree178ef0f91ec8cfda41cf2209f0b1197d430af059
parent683f6daa97fa09118b50419fb37c543ede65be18
dri: Merge drisw_util.c into dri_util.c

The only important difference was not calling drmGetVersion, and making
the swrast extension vtable.  That doesn't justify duplicating the other
330 lines of code.

v2: fix the scons build (code by Emil Velikov)
v3: fix scons build with swrast-only (code by Emil Velikov)
v4: Drop the new define I added, when we already have __NOT_HAVE_DRM_H.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
src/gallium/targets/SConscript.dri
src/gallium/targets/dri-swrast/Makefile.am
src/gallium/targets/dri-swrast/SConscript
src/mesa/drivers/SConscript
src/mesa/drivers/dri/common/dri_util.c
src/mesa/drivers/dri/common/drisw_util.c [deleted file]
src/mesa/drivers/dri/swrast/Makefile.sources