summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2015-11-25 17:10:39 +0100
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2016-02-26 11:28:58 +0000
commit97474cae830524fe57887d26743760bd49bb47ec (patch)
tree4586df54d78ee42fe185bb2900cae40e33cc153f /vcl
parent236f3089175c601e2be36d034b3214d06be89767 (diff)
log some information about used OpenGL device
Change-Id: I0c050396e6b1efa7dd2f003a79a9dc506135197a Reviewed-on: https://gerrit.libreoffice.org/22555 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'vcl')
-rw-r--r--vcl/Library_vcl.mk2
-rw-r--r--vcl/opengl/win/WinDeviceInfo.cxx4
-rw-r--r--vcl/opengl/x11/X11DeviceInfo.cxx5
3 files changed, 11 insertions, 0 deletions
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 2c0db54011c3..0ae75642cc80 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -69,6 +69,8 @@ $(eval $(call gb_Library_use_externals,vcl,\
))
$(eval $(call gb_Library_use_libraries,vcl,\
+ $(call gb_Helper_optional,BREAKPAD, \
+ crashreport) \
svl \
tl \
utl \
diff --git a/vcl/opengl/win/WinDeviceInfo.cxx b/vcl/opengl/win/WinDeviceInfo.cxx
index 4f334539f490..e9278b144d18 100644
--- a/vcl/opengl/win/WinDeviceInfo.cxx
+++ b/vcl/opengl/win/WinDeviceInfo.cxx
@@ -22,6 +22,8 @@
#include <rtl/ustrbuf.hxx>
#include <tools/stream.hxx>
+#include <desktop/crashreport.hxx>
+
OUString* WinOpenGLDeviceInfo::mpDeviceVendors[wgl::DeviceVendorMax];
std::vector<wgl::DriverInfo> WinOpenGLDeviceInfo::maDriverInfo;
@@ -519,6 +521,8 @@ void writeToLog(SvStream& rStrm, const char* pKey, const OUString rVal)
bool WinOpenGLDeviceInfo::isDeviceBlocked()
{
+ // CrashReporter::AddKeyAndValue("AdapterVendorId", maAdapterVendorID);
+ // CrashReporter::AddKeyAndValue("AdapterDeviceId", maAdapterDeviceID);
SAL_INFO("vcl.opengl", maDriverVersion);
SAL_INFO("vcl.opengl", maDriverDate);
SAL_INFO("vcl.opengl", maDeviceID);
diff --git a/vcl/opengl/x11/X11DeviceInfo.cxx b/vcl/opengl/x11/X11DeviceInfo.cxx
index 4a5a9c30d0e6..4be9619bb2d2 100644
--- a/vcl/opengl/x11/X11DeviceInfo.cxx
+++ b/vcl/opengl/x11/X11DeviceInfo.cxx
@@ -20,6 +20,8 @@
#include <errno.h>
#include <sys/utsname.h>
+#include <desktop/crashreport.hxx>
+
namespace glx {
static int glxtest_pipe = 0;
@@ -288,6 +290,9 @@ bool X11OpenGLDeviceInfo::isDeviceBlocked()
if (mnGLMajorVersion == 1)
return true;
+ CrashReporter::AddKeyValue("AdapterVendorId", rtl::OStringToOUString(maVendor, RTL_TEXTENCODING_UTF8));
+ CrashReporter::AddKeyValue("AdapterDeviceId", rtl::OStringToOUString(maRenderer, RTL_TEXTENCODING_UTF8));
+
SAL_INFO("vcl.opengl", "Vendor: " << maVendor);
SAL_INFO("vcl.opengl", "Renderer: " << maRenderer);
SAL_INFO("vcl.opengl", "Version: " << maVersion);