fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 22:38:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

st/dri/drm: remove __driDriverExtensions and driDriverAPI

Browse source 
... and use libmegadriver_stub as their provider.
Teach scons how to build the library archive and use it.

v2: scons: fix build on a drm-less system.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Tested-by: Rob Clark <robclark@freedesktop.org>
Tested-by: Thomas Helland <thomashelland90 at gmail.com>
Acked-by: Tom Stellard <thomas.stellard@amd.com>
This commit is contained in:
Emil Velikov 2014-06-27 19:30:38 +01:00
parent 3b7c120be3
commit 0e357234f3
4 changed files with 29 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/gallium/state_trackers/dri/drm/dri2.c
View file

@ -1328,20 +1328,6 @@ dri2_create_buffer(__DRIscreen * sPriv,
*
* DRI versions differ in their implementation of init_screen and swap_buffers.
*/
const struct __DriverAPIRec driDriverAPI = {
.InitScreen = dri2_init_screen,
.DestroyScreen = dri_destroy_screen,
.CreateContext = dri_create_context,
.DestroyContext = dri_destroy_context,
.CreateBuffer = dri2_create_buffer,
.DestroyBuffer = dri_destroy_buffer,
.MakeCurrent = dri_make_current,
.UnbindContext = dri_unbind_context,
.AllocateBuffer = dri2_allocate_buffer,
.ReleaseBuffer = dri2_release_buffer,
};
const struct __DriverAPIRec galliumdrm_driver_api = {
.InitScreen = dri2_init_screen,
.DestroyScreen = dri_destroy_screen,
@ -1357,14 +1343,6 @@ const struct __DriverAPIRec galliumdrm_driver_api = {
};
/* This is the table of extensions that the loader will dlsym() for. */
PUBLIC const __DRIextension *__driDriverExtensions[] = {
&driCoreExtension.base,
&driImageDriverExtension.base,
&driDRI2Extension.base,
&gallium_config_options.base,
NULL
};
const __DRIextension *galliumdrm_driver_extensions[] = {
&driCoreExtension.base,
&driImageDriverExtension.base,

1
src/gallium/targets/dri/Makefile.am
View file

@ -37,6 +37,7 @@ endif # HAVE_LD_VERSION_SCRIPT
gallium_dri_la_LIBADD = \
$(top_builddir)/src/mesa/libmesagallium.la \
$(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \
$(top_builddir)/src/mesa/drivers/dri/common/libmegadriver_stub.la \
$(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \
$(top_builddir)/src/gallium/auxiliary/libgallium.la \
$(top_builddir)/src/gallium/drivers/galahad/libgalahad.la \

1
src/gallium/targets/dri/SConscript
View file

@ -34,6 +34,7 @@ env.Prepend(LIBS = [
mesa,
glsl,
gallium,
megadrivers_stub,
COMMON_DRI_DRM_OBJECTS
])

27
src/mesa/drivers/dri/common/SConscript
View file

@ -76,9 +76,36 @@ driswenv.AppendUnique(LIBS = [
'expat',
])
#
# megadrivers_stub
#
env = env.Clone()
env.Append(CPPPATH = [
'#/include',
'#/src/',
'#/src/mapi',
'#/src/mesa',
])
env.Append(CPPDEFINES = [
'__NOT_HAVE_DRM_H',
'HAVE_DLADDR',
])
sources = env.ParseSourceList('Makefile.sources', 'megadriver_stub_FILES')
megadrivers_stub = env.ConvenienceLibrary(
target = 'megadrivers_stub',
source = sources,
)
env.Alias('megadrivers_stub', megadrivers_stub)
Export([
'drienv',
'driswenv',
'COMMON_DRI_SW_OBJECTS',
'COMMON_DRI_DRM_OBJECTS',
'megadrivers_stub',
])