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

glx: replace a straggler DRI_CONFIG_OPTIONS usage

Browse source 
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30524>
This commit is contained in:
Mike Blumenkrantz 2024-07-30 15:18:37 -04:00 • committed by Marge Bot
parent 3410161dc7
commit c3c490f775
2 changed files with 4 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/glx/dri_common.c
View file

@ -44,6 +44,7 @@
#include <X11/Xlib-xcb.h>
#include <xcb/xproto.h>
#include "dri_util.h"
#include "pipe-loader/pipe_loader.h"
#ifndef RTLD_NOW
#define RTLD_NOW 0
@ -734,29 +735,6 @@ clear_driver_config_cache()
}
}
static char *
get_driver_config(const char *driverName)
{
char *config = NULL;
const __DRIextension **extensions = driOpenDriver(driverName, false);
if (extensions) {
for (int i = 0; extensions[i]; i++) {
if (strcmp(extensions[i]->name, __DRI_CONFIG_OPTIONS) != 0)
continue;
__DRIconfigOptionsExtension *ext =
(__DRIconfigOptionsExtension *)extensions[i];
if (ext->base.version >= 2)
config = ext->getXml(driverName);
break;
}
}
return config;
}
/*
* Exported function for obtaining a driver's option list (UTF-8 encoded XML).
*
@ -782,7 +760,7 @@ glXGetDriverConfig(const char *driverName)
if (!e)
goto out;
e->config = get_driver_config(driverName);
e->config = pipe_loader_get_driinfo_xml(driverName);
e->driverName = strdup(driverName);
if (!e->config || !e->driverName) {
free(e->config);

4
src/glx/meson.build
View file

@ -104,7 +104,7 @@ else
)
endif
glx_gallium_link = []
glx_gallium_link = [libpipe_loader_dynamic]
if with_dri
glx_gallium_link += libgallium_dri
endif
@ -115,7 +115,7 @@ libglx = static_library(
'glx',
[files_libglx, glx_generated],
include_directories : [inc_include, inc_src, inc_glapi, inc_loader, inc_loader_x11,
inc_loader_dri3, inc_gallium, inc_mesa, inc_st_dri],
inc_loader_dri3, inc_gallium, inc_mesa, inc_st_dri, inc_gallium_aux],
c_args : [
'-DGL_LIB_NAME="lib@0@.so.@1@"'.format(gl_lib_name, gl_lib_version.split('.')[0]),
],