parent
3a4b7d3071
commit
3c967a9207
|
@ -61,7 +61,7 @@ DRIVER_DIRS = dri
|
|||
WINDOW_SYSTEM = dri
|
||||
GALLIUM_WINSYS_DIRS = drm
|
||||
GALLIUM_WINSYS_DRM_DIRS = vmware intel i965
|
||||
GALLIUM_STATE_TRACKERS_DIRS = egl_g3d
|
||||
GALLIUM_STATE_TRACKERS_DIRS = egl
|
||||
|
||||
DRI_DIRS = i810 i915 i965 mach64 mga r128 r200 r300 radeon \
|
||||
savage sis tdfx unichrome ffb swrast
|
||||
|
|
|
@ -9,7 +9,7 @@ LIB_DIR = lib
|
|||
SRC_DIRS = egl glsl mesa/es gallium gallium/winsys
|
||||
PROGRAM_DIRS = es1/screen es1/xegl es2/xegl
|
||||
|
||||
# egl_g3d needs this
|
||||
# egl st needs this
|
||||
DEFINES += -DGLX_DIRECT_RENDERING
|
||||
|
||||
# no mesa or egl drivers
|
||||
|
@ -23,6 +23,6 @@ GALLIUM_STATE_TRACKERS_DIRS = es
|
|||
|
||||
# build egl_x11_{swrast,i915}.so
|
||||
GALLIUM_DRIVERS_DIRS += trace i915
|
||||
GALLIUM_STATE_TRACKERS_DIRS += egl_g3d
|
||||
GALLIUM_STATE_TRACKERS_DIRS += egl
|
||||
GALLIUM_WINSYS_DIRS += drm
|
||||
GALLIUM_WINSYS_DRM_DIRS += intel swrast
|
||||
|
|
|
@ -1165,7 +1165,7 @@ yes)
|
|||
dri)
|
||||
GALLIUM_STATE_TRACKERS_DIRS="dri"
|
||||
if test "x$enable_egl" = xyes; then
|
||||
GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS egl_g3d"
|
||||
GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS egl"
|
||||
fi
|
||||
# Have only tested st/xorg on 1.6.0 servers
|
||||
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.6.0],
|
||||
|
@ -1182,9 +1182,9 @@ yes)
|
|||
AC_MSG_ERROR([state tracker '$tracker' doesn't exist])
|
||||
|
||||
case "$tracker" in
|
||||
egl_g3d)
|
||||
egl)
|
||||
if test "x$enable_egl" != xyes; then
|
||||
AC_MSG_ERROR([cannot build egl_g3d state tracker without EGL library])
|
||||
AC_MSG_ERROR([cannot build egl state tracker without EGL library])
|
||||
fi
|
||||
;;
|
||||
xorg)
|
||||
|
@ -1223,7 +1223,7 @@ yes)
|
|||
# verify the requested driver directories exist
|
||||
egl_displays=`IFS=', '; echo $with_egl_displays`
|
||||
for dpy in $egl_displays; do
|
||||
test -d "$srcdir/src/gallium/state_trackers/egl_g3d/$dpy" || \
|
||||
test -d "$srcdir/src/gallium/state_trackers/egl/$dpy" || \
|
||||
AC_MSG_ERROR([EGL display '$dpy' does't exist])
|
||||
done
|
||||
EGL_DISPLAYS="$egl_displays"
|
||||
|
|
|
@ -32,10 +32,10 @@ cards.</p>
|
|||
the Gallium driver for your hardware. For example</p>
|
||||
|
||||
<pre>
|
||||
$ ./configure --with-state-trackers=egl_g3d,es,vega --enable-gallium-intel
|
||||
$ ./configure --with-state-trackers=egl,es,vega --enable-gallium-intel
|
||||
</pre>
|
||||
|
||||
<p>The main library will be enabled by default. The <code>egl_g3d</code> state
|
||||
<p>The main library will be enabled by default. The <code>egl</code> state
|
||||
tracker is needed by a number of EGL drivers. EGL drivers will be covered
|
||||
later. The <a href="opengles.html">es state tracker</a> provides OpenGL ES 1.x
|
||||
and 2.x and the <a href="openvg.html">vega state tracker</a> provides OpenVG
|
||||
|
@ -77,9 +77,8 @@ bare KMS (kernel modesetting).</p>
|
|||
|
||||
<p>The argument is a comma separated string. It is usually used to specify the
|
||||
rendering APIs, like OpenGL ES or OpenVG, to build. But it should be noted
|
||||
that a number of EGL drivers depend on the <code>egl_g3d</code> state tracker.
|
||||
They will <em>not</em> be built without the <code>egl_g3d</code> state
|
||||
tracker.</p>
|
||||
that a number of EGL drivers depend on the <code>egl</code> state tracker.
|
||||
They will <em>not</em> be built without the <code>egl</code> state tracker.</p>
|
||||
|
||||
</li>
|
||||
|
||||
|
@ -160,7 +159,7 @@ variable to true forces the use of software rendering.</p>
|
|||
|
||||
<p>Gallium EGL drivers supports all rendering APIs specified in EGL 1.4. The
|
||||
support for optional EGL functions and EGL extensions is usually more complete
|
||||
than the classic ones. These drivers depend on the <code>egl_g3d</code> state
|
||||
than the classic ones. These drivers depend on the <code>egl</code> state
|
||||
tracker to build. The available drivers are</p>
|
||||
|
||||
<ul>
|
||||
|
@ -218,8 +217,8 @@ runtime.</p>
|
|||
<h2>Developers</h2>
|
||||
|
||||
The sources of the main library and the classic drivers can be found at
|
||||
<code>src/egl/</code>. The sources of the <code>egl_g3d</code> state tracker
|
||||
can be found at <code>src/gallium/state_trackers/egl_g3d/</code>.
|
||||
<code>src/egl/</code>. The sources of the <code>egl</code> state tracker can
|
||||
be found at <code>src/gallium/state_trackers/egl/</code>.
|
||||
|
||||
<h3>TODOs</h3>
|
||||
|
||||
|
|
|
@ -20,7 +20,7 @@ for more information about EGL.</p>
|
|||
|
||||
<h2>Build the Libraries</h2>
|
||||
<ol>
|
||||
<li>Run <code>configure</code> with <code>--with-state-trackers=egl_g3d,es</code> and enable the Gallium driver for your hardware.</li>
|
||||
<li>Run <code>configure</code> with <code>--with-state-trackers=egl,es</code> and enable the Gallium driver for your hardware.</li>
|
||||
<li>Build and install Mesa as usual.</li>
|
||||
</ol>
|
||||
|
||||
|
|
|
@ -34,7 +34,7 @@ Please refer to <a href="egl.html">Mesa EGL</a> for more information about EGL.
|
|||
<h3>Sample build</h3>
|
||||
A sample build looks as follows:
|
||||
<pre>
|
||||
$ ./configure --with-state-trackers=egl_g3d,vega --enable-gallium-intel
|
||||
$ ./configure --with-state-trackers=egl,vega --enable-gallium-intel
|
||||
$ make
|
||||
$ make install
|
||||
</pre>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# src/gallium/winsys/drm/Makefile.egl_g3d
|
||||
# src/gallium/winsys/drm/Makefile.egl
|
||||
|
||||
# The driver Makefile should define
|
||||
#
|
||||
|
@ -13,10 +13,10 @@ EGL_DRIVER_OBJECTS = $(EGL_DRIVER_SOURCES:.c=.o)
|
|||
|
||||
common_LIBS = -ldrm -lm -ldl
|
||||
|
||||
x11_ST = $(TOP)/src/gallium/state_trackers/egl_g3d/libeglx11.a
|
||||
x11_ST = $(TOP)/src/gallium/state_trackers/egl/libeglx11.a
|
||||
x11_LIBS = $(common_LIBS) -lX11 -lXext -lXfixes
|
||||
|
||||
kms_ST = $(TOP)/src/gallium/state_trackers/egl_g3d/libeglkms.a
|
||||
kms_ST = $(TOP)/src/gallium/state_trackers/egl/libeglkms.a
|
||||
kms_LIBS = $(common_LIBS)
|
||||
|
||||
##### RULES #####
|
|
@ -11,4 +11,4 @@ EGL_DRIVER_PIPES = \
|
|||
$(TOP)/src/gallium/drivers/trace/libtrace.a \
|
||||
$(TOP)/src/gallium/drivers/i965/libi965.a
|
||||
|
||||
include ../../Makefile.egl_g3d
|
||||
include ../../Makefile.egl
|
|
@ -11,4 +11,4 @@ EGL_DRIVER_PIPES = \
|
|||
$(TOP)/src/gallium/drivers/trace/libtrace.a \
|
||||
$(TOP)/src/gallium/drivers/i915/libi915.a
|
||||
|
||||
include ../../Makefile.egl_g3d
|
||||
include ../../Makefile.egl
|
|
@ -16,4 +16,4 @@ EGL_DRIVER_PIPES = \
|
|||
$(TOP)/src/gallium/drivers/nouveau/libnouveau.a \
|
||||
$(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a
|
||||
|
||||
include ../../Makefile.egl_g3d
|
||||
include ../../Makefile.egl
|
|
@ -11,4 +11,4 @@ EGL_DRIVER_PIPES = \
|
|||
$(TOP)/src/gallium/drivers/trace/libtrace.a \
|
||||
$(TOP)/src/gallium/drivers/r300/libr300.a
|
||||
|
||||
include ../../Makefile.egl_g3d
|
||||
include ../../Makefile.egl
|
|
@ -9,4 +9,4 @@ EGL_DRIVER_PIPES = \
|
|||
$(TOP)/src/gallium/winsys/drm/swrast/core/libswrastdrm.a \
|
||||
$(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a
|
||||
|
||||
include ../../Makefile.egl_g3d
|
||||
include ../../Makefile.egl
|
|
@ -11,4 +11,4 @@ EGL_DRIVER_PIPES = \
|
|||
$(TOP)/src/gallium/drivers/trace/libtrace.a \
|
||||
$(TOP)/src/gallium/drivers/svga/libsvga.a
|
||||
|
||||
include ../../Makefile.egl_g3d
|
||||
include ../../Makefile.egl
|
Loading…
Reference in New Issue