diff options
| author | Eric Anholt <[email protected]> | 2013-09-26 11:35:31 -0700 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2013-10-10 16:34:30 -0700 |
| commit | d81632fb1e809a0b1ee9310ae3a4733a1c0651b7 (patch) | |
| tree | 178ef0f91ec8cfda41cf2209f0b1197d430af059 /src/mesa/drivers/dri/swrast | |
| parent | 683f6daa97fa09118b50419fb37c543ede65be18 (diff) | |
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 <[email protected]>
Diffstat (limited to 'src/mesa/drivers/dri/swrast')
| -rw-r--r-- | src/mesa/drivers/dri/swrast/Makefile.sources | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/swrast/Makefile.sources b/src/mesa/drivers/dri/swrast/Makefile.sources index 7630dba4b0e..fc7ef32dbd5 100644 --- a/src/mesa/drivers/dri/swrast/Makefile.sources +++ b/src/mesa/drivers/dri/swrast/Makefile.sources @@ -3,7 +3,8 @@ SWRAST_DRIVER_FILES = \ SWRAST_COMMON_FILES = \ ../common/utils.c \ - ../common/drisw_util.c + ../common/dri_util.c \ + ../common/xmlconfig.c SWRAST_C_FILES = \ $(SWRAST_COMMON_FILES) \ |