OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: Rename PIPE_LOADER_HAVE_XCB to HAVE_PIPE_LOADER_XCB.

Browse Source 
For consistency, since we already have HAVE_PIPE_LOADER_{SW,DRM}.

Tested-by: Tom Stellard <thomas.stellard@amd.com>
Tested-by: Aaron Watry <awatry@gmail.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Matt Turner
2013-04-22 11:50:29 -07:00
parent 657cfe6252
commit 242809942f
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@@ -1926,7 +1926,7 @@ if test "x$enable_gallium_loader" = xyes; then
PKG_CHECK_MODULES([GALLIUM_PIPE_LOADER_XCB], [xcb xcb-dri2], PKG_CHECK_MODULES([GALLIUM_PIPE_LOADER_XCB], [xcb xcb-dri2],
pipe_loader_have_xcb=yes, pipe_loader_have_xcb=no) pipe_loader_have_xcb=yes, pipe_loader_have_xcb=no)
if test "x$pipe_loader_have_xcb" = xyes; then if test "x$pipe_loader_have_xcb" = xyes; then
GALLIUM_PIPE_LOADER_DEFINES="$GALLIUM_PIPE_LOADER_DEFINES -DPIPE_LOADER_HAVE_XCB" GALLIUM_PIPE_LOADER_DEFINES="$GALLIUM_PIPE_LOADER_DEFINES -DHAVE_PIPE_LOADER_XCB"
GALLIUM_PIPE_LOADER_LIBS="$GALLIUM_PIPE_LOADER_LIBS $GALLIUM_PIPE_LOADER_XCB_LIBS $LIBDRM_LIBS" GALLIUM_PIPE_LOADER_LIBS="$GALLIUM_PIPE_LOADER_LIBS $GALLIUM_PIPE_LOADER_XCB_LIBS $LIBDRM_LIBS"
fi fi
fi fi

4
src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c
View File

@@ -35,7 +35,7 @@
#include <libudev.h> #include <libudev.h>
#include <xf86drm.h> #include <xf86drm.h>
#ifdef PIPE_LOADER_HAVE_XCB #ifdef HAVE_PIPE_LOADER_XCB
#include <xcb/dri2.h> #include <xcb/dri2.h>
@@ -133,7 +133,7 @@ static struct pipe_loader_ops pipe_loader_drm_ops;
static void static void
pipe_loader_drm_x_auth(int fd) pipe_loader_drm_x_auth(int fd)
{ {
#if PIPE_LOADER_HAVE_XCB #if HAVE_PIPE_LOADER_XCB
/* Try authenticate with the X server to give us access to devices that X /* Try authenticate with the X server to give us access to devices that X
* is running on. */ * is running on. */
xcb_connection_t *xcb_conn; xcb_connection_t *xcb_conn;