diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-05-08 23:20:40 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-05-08 23:20:40 +0100 |
| commit | 96d77b1289c8e535e97154bae4561d0e589c7f22 (patch) | |
| tree | 6b2b6277f09e9c342422b8e776171d6a5e9febcb | |
| parent | c2f6804ccc6a2481e0074fe6fa040de57d6b1c73 (diff) | |
More hackz.attic/opengl
| -rw-r--r-- | src/tools/dcpomatic.cc | 2 | ||||
| -rw-r--r-- | src/wx/gl_view.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc index f6427e68e..35d5a8679 100644 --- a/src/tools/dcpomatic.cc +++ b/src/tools/dcpomatic.cc @@ -278,7 +278,7 @@ public: setvbuf(hf_in, NULL, _IONBF, 128); *stdin = *hf_in; - cout << "DCP-o-matic is starting." << "\n"; + cout << "DCP-o-matic is starting (in GL land)." << "\n"; } #endif diff --git a/src/wx/gl_view.cc b/src/wx/gl_view.cc index 5159da366..07ee69386 100644 --- a/src/wx/gl_view.cc +++ b/src/wx/gl_view.cc @@ -44,8 +44,6 @@ GLView::GLView (wxWindow *parent) glGenTextures (1, &_id); glBindTexture (GL_TEXTURE_2D, _id); glPixelStorei (GL_UNPACK_ALIGNMENT, 1); - - cout << glGetString (GL_VERSION) << "\n"; } GLView::~GLView () @@ -123,6 +121,8 @@ GLView::paint (wxPaintEvent &) void GLView::set_image (shared_ptr<const Image> image) { + cout << glGetString (GL_VERSION) << "\n"; + DCPOMATIC_ASSERT (image->pixel_format() == AV_PIX_FMT_RGB24); DCPOMATIC_ASSERT (!image->aligned()); |