[Libreoffice-commits] core.git: include/desktop vcl/Library_vcl.mk vcl/opengl

[Markus Mohrhard]

 include/desktop/crashreport.hxx  |    2 +-
 vcl/Library_vcl.mk               |    2 ++
 vcl/opengl/win/WinDeviceInfo.cxx |    4 ++++
 vcl/opengl/x11/X11DeviceInfo.cxx |    5 +++++
 4 files changed, 12 insertions(+), 1 deletion(-)

New commits:
commit 97474cae830524fe57887d26743760bd49bb47ec
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Wed Nov 25 17:10:39 2015 +0100

    log some information about used OpenGL device
    
    Change-Id: I0c050396e6b1efa7dd2f003a79a9dc506135197a
    Reviewed-on: https://gerrit.libreoffice.org/22555
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/include/desktop/crashreport.hxx b/include/desktop/crashreport.hxx
index b1f15fb..02cc5a0 100644
--- a/include/desktop/crashreport.hxx
+++ b/include/desktop/crashreport.hxx
@@ -44,7 +44,7 @@ private:
 // everywhere we want to log something to the crash report system.
 #if HAVE_FEATURE_BREAKPAD
 #else
-void CrashReporter::AddKeyValue(const OUString& /*rKey*/, const OUString& /*rValue*/)
+inline void CrashReporter::AddKeyValue(const OUString& /*rKey*/, const OUString& /*rValue*/)
 {
 }
 #endif
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 2c0db54..0ae7564 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 4f33453..e9278b1 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 4a5a9c3..4be9619 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);