Hash :
d1e26fa2
Author :
Date :
2023-08-04T11:07:25
gpu_info_util: Close X11 display after usage This ensures that the X11 display connection won't leak if GetNvidiaDriverVersionWithXNVCtrl gets called multiple times. Bug: angleproject:8294 Change-Id: Id9fe8e6b6d5524965c1638841af88416fe28c76a Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4749333 Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org> Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58
//
// Copyright 2013 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
// SystemInfo_x11.cpp: implementation of the X11-specific parts of SystemInfo.h
#include "gpu_info_util/SystemInfo_internal.h"
#include <X11/Xlib.h>
#include "common/debug.h"
#include "third_party/libXNVCtrl/NVCtrl.h"
#include "third_party/libXNVCtrl/NVCtrlLib.h"
#if !defined(GPU_INFO_USE_X11)
# error SystemInfo_x11.cpp compiled without GPU_INFO_USE_X11
#endif
namespace angle
{
bool GetNvidiaDriverVersionWithXNVCtrl(std::string *version)
{
*version = "";
int eventBase = 0;
int errorBase = 0;
Display *display = XOpenDisplay(nullptr);
if (display && XNVCTRLQueryExtension(display, &eventBase, &errorBase))
{
int screenCount = ScreenCount(display);
for (int screen = 0; screen < screenCount; ++screen)
{
char *buffer = nullptr;
if (XNVCTRLIsNvScreen(display, screen) &&
XNVCTRLQueryStringAttribute(display, screen, 0,
NV_CTRL_STRING_NVIDIA_DRIVER_VERSION, &buffer))
{
ASSERT(buffer != nullptr);
*version = buffer;
XFree(buffer);
return true;
}
}
}
if (display)
{
XCloseDisplay(display);
}
return false;
}
} // namespace angle