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/gallium | |
| 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/gallium')
| -rw-r--r-- | src/gallium/targets/SConscript.dri | 17 | ||||
| -rw-r--r-- | src/gallium/targets/dri-swrast/Makefile.am | 2 | ||||
| -rw-r--r-- | src/gallium/targets/dri-swrast/SConscript | 2 |
3 files changed, 14 insertions, 7 deletions
diff --git a/src/gallium/targets/SConscript.dri b/src/gallium/targets/SConscript.dri index 04c8ec789f8..8b15532e3c0 100644 --- a/src/gallium/targets/SConscript.dri +++ b/src/gallium/targets/SConscript.dri @@ -3,9 +3,6 @@ Import('*') -if not env['dri']: - Return() - drienv = env.Clone() drienv.Replace(CPPPATH = [ @@ -30,6 +27,11 @@ drienv.Replace(CPPPATH = [ '#src/egl/drivers/dri', ]) +driswenv = drienv.Clone() +driswenv.Append(CPPDEFINES = [ + '__NOT_HAVE_DRM_H', +]) + drienv.PkgUseModules('DRM') dri_common_utils = drienv.SharedObject( @@ -47,9 +49,9 @@ dri_common_dri_util = drienv.SharedObject( source = '#src/mesa/drivers/dri/common/dri_util.c' ) -dri_common_drisw_util = drienv.SharedObject( +dri_common_drisw_util = driswenv.SharedObject( target = 'drisw_util.o', - source = '#src/mesa/drivers/dri/common/drisw_util.c' + source = '#src/mesa/drivers/dri/common/dri_util.c' ) @@ -69,8 +71,13 @@ drienv.AppendUnique(LIBS = [ 'expat', ]) +driswenv.AppendUnique(LIBS = [ + 'expat', +]) + Export([ 'drienv', + 'driswenv', 'COMMON_DRI_SW_OBJECTS', 'COMMON_DRI_DRM_OBJECTS', ]) diff --git a/src/gallium/targets/dri-swrast/Makefile.am b/src/gallium/targets/dri-swrast/Makefile.am index cdbda976457..5d2f1463868 100644 --- a/src/gallium/targets/dri-swrast/Makefile.am +++ b/src/gallium/targets/dri-swrast/Makefile.am @@ -44,7 +44,7 @@ dri_LTLIBRARIES = swrast_dri.la swrast_dri_la_SOURCES = \ swrast_drm_api.c \ $(top_srcdir)/src/mesa/drivers/dri/common/utils.c \ - $(top_srcdir)/src/mesa/drivers/dri/common/drisw_util.c \ + $(top_srcdir)/src/mesa/drivers/dri/common/dri_util.c \ $(top_srcdir)/src/mesa/drivers/dri/common/xmlconfig.c swrast_dri_la_LDFLAGS = $(DRI_DRIVER_LDFLAGS) diff --git a/src/gallium/targets/dri-swrast/SConscript b/src/gallium/targets/dri-swrast/SConscript index 6b64c56413c..8ddd14ea5a7 100644 --- a/src/gallium/targets/dri-swrast/SConscript +++ b/src/gallium/targets/dri-swrast/SConscript @@ -1,6 +1,6 @@ Import('*') -env = drienv.Clone() +env = driswenv.Clone() env.Append(CPPPATH = [ '#/src/gallium/winsys/sw/dri', |