diff options
author | Dan Gudmundsson <[email protected]> | 2016-10-24 13:05:52 +0200 |
---|---|---|
committer | Dan Gudmundsson <[email protected]> | 2016-10-24 13:05:52 +0200 |
commit | 1a812284999c8f38d84f380775b88f7bdc1f1432 (patch) | |
tree | d94aac6989e1d3c40563327f8dabc9122d71d51d /lib/wx/test/wx_opengl_SUITE.erl | |
parent | adf1e9efdfb979d55b2f4dfec7188dd8f0a640c9 (diff) | |
parent | 16b6c991cc841ced6be466eca774dba1188f8640 (diff) | |
download | otp-1a812284999c8f38d84f380775b88f7bdc1f1432.tar.gz otp-1a812284999c8f38d84f380775b88f7bdc1f1432.tar.bz2 otp-1a812284999c8f38d84f380775b88f7bdc1f1432.zip |
Merge branch 'maint'
* maint:
Fix whitespace setting in test files
Avoid some error reports when stopping mnesia
wx: Improve error handling
Fix all whitespace-related issues in erlang.el
mnesia: Fix double blocked tables which could cause a crash
wx: Add wxWindow:getContentScaleFactor
Diffstat (limited to 'lib/wx/test/wx_opengl_SUITE.erl')
-rw-r--r-- | lib/wx/test/wx_opengl_SUITE.erl | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/wx/test/wx_opengl_SUITE.erl b/lib/wx/test/wx_opengl_SUITE.erl index 643a0df6a3..3de9209fae 100644 --- a/lib/wx/test/wx_opengl_SUITE.erl +++ b/lib/wx/test/wx_opengl_SUITE.erl @@ -111,6 +111,8 @@ canvas(Config) -> ?m(false, wx:is_null(wxGLCanvas:getContext(Canvas))), ?m({'EXIT', {{error, no_gl_context,_},_}}, gl:getString(?GL_VENDOR)), + gl:viewport(0,0,50,50), %% Show cause an error report + ?m(ok, wxGLCanvas:setCurrent(Canvas)), io:format("Vendor: ~s~n", [gl:getString(?GL_VENDOR)]), |