glamor_eglmodule: Change module name according to normalize naming rule.
As Xorg module loader will normalize module name which will remove '_' when we put "glamor_egl" to the configure file, then it will fail to find us. Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
This commit is contained in:
parent
1ab4002874
commit
1817b6c0cf
|
@ -50,13 +50,12 @@ libglamor_la_SOURCES = \
|
||||||
sdk_HEADERS = glamor.h
|
sdk_HEADERS = glamor.h
|
||||||
|
|
||||||
if EGL
|
if EGL
|
||||||
LIBGLAMOR_EGL = libglamor_egl.la
|
LIBGLAMOREGL = libglamoregl.la
|
||||||
module_LTLIBRARIES = $(LIBGLAMOR_EGL)
|
module_LTLIBRARIES = $(LIBGLAMOREGL)
|
||||||
libglamor_egl_la_DEPENDENCIES = libglamor.la
|
libglamoregl_la_DEPENDENCIES = libglamor.la
|
||||||
libglamor_egl_la_LDFLAGS = -avoid-version -module $(EGL_LIBS) -lglamor
|
libglamoregl_la_LDFLAGS = -avoid-version -module $(EGL_LIBS) -lglamor
|
||||||
#libglamor_egl_la_LIBADD = $(top_builddir)/src/libglamor.la
|
libglamoregl_la_SOURCES = glamor_eglmodule.c $(top_srcdir)/src/glamor_egl.c
|
||||||
libglamor_egl_la_SOURCES = glamor_eglmodule.c $(top_srcdir)/src/glamor_egl.c
|
libglamoregl_la_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/src $(LIBDRM_CFLAGS) $(EGL_CFLAGS)
|
||||||
libglamor_egl_la_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/src $(LIBDRM_CFLAGS) $(EGL_CFLAGS)
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -146,6 +146,9 @@ extern _X_EXPORT PixmapPtr glamor_create_pixmap(ScreenPtr screen, int w, int h,
|
||||||
extern _X_EXPORT void glamor_egl_screen_init(ScreenPtr screen);
|
extern _X_EXPORT void glamor_egl_screen_init(ScreenPtr screen);
|
||||||
|
|
||||||
#ifdef GLAMOR_FOR_XORG
|
#ifdef GLAMOR_FOR_XORG
|
||||||
|
|
||||||
|
#define GLAMOR_EGL_MODULE_NAME "glamoregl"
|
||||||
|
|
||||||
/* @glamor_egl_init: Initialize EGL environment.
|
/* @glamor_egl_init: Initialize EGL environment.
|
||||||
*
|
*
|
||||||
* @scrn: Current screen info pointer.
|
* @scrn: Current screen info pointer.
|
||||||
|
|
|
@ -29,11 +29,12 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <xorg-server.h>
|
#include <xorg-server.h>
|
||||||
|
#define GLAMOR_FOR_XORG
|
||||||
|
#include "glamor.h"
|
||||||
#include "xf86Module.h"
|
#include "xf86Module.h"
|
||||||
|
|
||||||
static XF86ModuleVersionInfo VersRec = {
|
static XF86ModuleVersionInfo VersRec = {
|
||||||
"glamor_egl",
|
GLAMOR_EGL_MODULE_NAME,
|
||||||
MODULEVENDORSTRING,
|
MODULEVENDORSTRING,
|
||||||
MODINFOSTRING1,
|
MODINFOSTRING1,
|
||||||
MODINFOSTRING2,
|
MODINFOSTRING2,
|
||||||
|
@ -45,4 +46,4 @@ static XF86ModuleVersionInfo VersRec = {
|
||||||
{0, 0, 0, 0} /* signature, to be patched into the file by a tool */
|
{0, 0, 0, 0} /* signature, to be patched into the file by a tool */
|
||||||
};
|
};
|
||||||
|
|
||||||
_X_EXPORT XF86ModuleData glamor_eglModuleData = { &VersRec, NULL, NULL };
|
_X_EXPORT XF86ModuleData glamoreglModuleData = { &VersRec, NULL, NULL };
|
||||||
|
|
Loading…
Reference in New Issue
Block a user