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

gallium/aux: Report error if loading of a pipe driver fails.

Browse source 
Skip over non-existent files.
Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Jan Vesely 2019-04-02 17:03:13 -04:00
parent 2b780fe893
commit 6ec9733b9f
2 changed files with 62 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/gallium/auxiliary/pipe-loader/pipe_loader.c
View file

@ -31,6 +31,7 @@
#include "util/u_memory.h"
#include "util/u_string.h"
#include "util/u_dl.h"
#include "util/u_file.h"
#include "util/xmlconfig.h"
#include "util/xmlpool.h"
@ -158,11 +159,13 @@ pipe_loader_find_module(const char *driver_name,
ret = util_snprintf(path, sizeof(path), "%s%s%s",
MODULE_PREFIX, driver_name, UTIL_DL_EXT);
if (ret > 0 && ret < sizeof(path)) {
if (ret > 0 && ret < sizeof(path) && u_file_access(path, 0) != -1) {
lib = util_dl_open(path);
if (lib) {
return lib;
}
fprintf(stderr, "ERROR: Failed to load pipe driver at `%s': %s\n",
path, util_dl_error());
}
}

58
src/gallium/auxiliary/util/u_file.h Normal file
View file

@ -0,0 +1,58 @@
/**************************************************************************
*
* Copyright 2009 VMware, Inc.
* All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, sub license, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
* THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,
* DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
* USE OR OTHER DEALINGS IN THE SOFTWARE.
*
* The above copyright notice and this permission notice (including the
* next paragraph) shall be included in all copies or substantial portions
* of the Software.
*
**************************************************************************/
#ifndef U_FILE_H_
#define U_FILE_H_
#if defined(PIPE_OS_UNIX)
#include <unistd.h>
#endif
#if defined(PIPE_OS_WINDOWS)
#include <io.h>
#endif
#ifdef __cplusplus
extern "C" {
#endif
static inline int
u_file_access(const char *path, int mode) {
#if defined(PIPE_OS_UNIX)
return access(path, mode);
#elif defined(PIPE_OS_WINDOWS)
return _access(path, mode);
#else
return 0;
#endif
}
#ifdef __cplusplus
}
#endif
#endif /* U_FILE_H_ */