diff options
Diffstat (limited to 'vcl/inc/opengl')
-rw-r--r-- | vcl/inc/opengl/program.hxx | 3 | ||||
-rw-r--r-- | vcl/inc/opengl/win/WinDeviceInfo.hxx | 46 | ||||
-rw-r--r-- | vcl/inc/opengl/x11/X11DeviceInfo.hxx | 26 |
3 files changed, 74 insertions, 1 deletions
diff --git a/vcl/inc/opengl/program.hxx b/vcl/inc/opengl/program.hxx index 7bdd43d3d51c..3a4751286332 100644 --- a/vcl/inc/opengl/program.hxx +++ b/vcl/inc/opengl/program.hxx @@ -50,7 +50,8 @@ public: OpenGLProgram(); ~OpenGLProgram(); - bool Load( const OUString& rVertexShader, const OUString& rFragmentShader, const OString& preamble = "" ); + bool Load( const OUString& rVertexShader, const OUString& rFragmentShader, + const rtl::OString& preamble = "", const rtl::OString& rDigest = "" ); bool Use(); bool Clean(); diff --git a/vcl/inc/opengl/win/WinDeviceInfo.hxx b/vcl/inc/opengl/win/WinDeviceInfo.hxx index 0c60b35f274e..a400404910a1 100644 --- a/vcl/inc/opengl/win/WinDeviceInfo.hxx +++ b/vcl/inc/opengl/win/WinDeviceInfo.hxx @@ -61,6 +61,7 @@ bool ParseDriverVersion(const OUString& rString, uint64_t& rVersion); struct DriverInfo { + DriverInfo(OperatingSystem os, const OUString& vendor, VersionComparisonOp op, uint64_t driverVersion, bool bWhiteListed = false, const char *suggestedVersion = nullptr); @@ -159,6 +160,51 @@ public: virtual ~WinOpenGLDeviceInfo(); virtual bool isDeviceBlocked(); + + const OUString& GetDriverVersion() const + { + return maDriverVersion; + } + + const OUString& GetDriverDate() const + { + return maDriverDate; + } + + const OUString& GetDeviceID() const + { + return maDeviceID; + } + + const OUString& GetAdapterVendorID() const + { + return maAdapterVendorID; + } + + const OUString& GetAdapterDeviceID() const + { + return maAdapterDeviceID; + } + + const OUString& GetAdapterSubsysID() const + { + return maAdapterSubsysID; + } + const OUString& GetDeviceKey() const + { + return maDeviceKey; + } + + const OUString& GetDeviceString() const + { + return maDeviceString; + } + + sal_uInt32 GetWindowsVersion() const + { + return mnWindowsVersion; + } + }; #endif diff --git a/vcl/inc/opengl/x11/X11DeviceInfo.hxx b/vcl/inc/opengl/x11/X11DeviceInfo.hxx index dfb720450d9b..c34deb3b8549 100644 --- a/vcl/inc/opengl/x11/X11DeviceInfo.hxx +++ b/vcl/inc/opengl/x11/X11DeviceInfo.hxx @@ -44,6 +44,32 @@ public: virtual ~X11OpenGLDeviceInfo(); virtual bool isDeviceBlocked() SAL_OVERRIDE; + + const OString& GetVendor() const + { + return maVendor; + } + + const OString& GetRenderer() const + { + return maRenderer; + } + + const OString& GetVersion() const + { + return maVersion; + } + + const OString& GetOS() const + { + return maOS; + } + + const OString& GetOSRelease() const + { + return maOSRelease; + } + }; #endif |