Mercurial > octave

comparison libgui/graphics/GLCanvas.h @ 31751:e863066429f1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
assume QOffscreenSurface is available QOffscreenSurface was introduced in Qt 5.1. * acinclude.m4 (OCTAVE_CHECK_QT_OPENGL_OFFSCREEN_OK): Delete. (OCTAVE_CHECK_QT_VERSION): Delete use. * configure.ac, geometryimages.m, interpimages.m, module.mk, plotimages.m, sparseimages.m, splineimages.m, GLCanvas.cc, GLCanvas.h, getframe.m, __check_rendering_capability__.m, copyobj.m, hgsave.m, jupyter-notebook.tst, publish.tst: Eliminate checks for Qt OffscreenSurface feature. Assume it is always available.
author John W. Eaton <jwe@octave.org>
date Tue, 17 Jan 2023 13:11:02 -0500
parents 5f11de0e7440
children 345a3f5890e7
comparison
equal deleted inserted replaced
31750:85723a361b2b 31751:e863066429f1
29 #if defined (HAVE_QOPENGLWIDGET) 29 #if defined (HAVE_QOPENGLWIDGET)
30 # include <QOpenGLWidget> 30 # include <QOpenGLWidget>
31 # define OCTAVE_QT_OPENGL_WIDGET QOpenGLWidget 31 # define OCTAVE_QT_OPENGL_WIDGET QOpenGLWidget
32 # include <QOpenGLFramebufferObject> 32 # include <QOpenGLFramebufferObject>
33 # define OCTAVE_QT_OPENGL_FBO QOpenGLFramebufferObject 33 # define OCTAVE_QT_OPENGL_FBO QOpenGLFramebufferObject
34 # if defined (HAVE_QT_OFFSCREEN) 34 # include <QOpenGLContext>
35 # include <QOpenGLContext> 35 # include <QOffscreenSurface>
36 # include <QOffscreenSurface>
37 # endif
38 #elif defined (HAVE_QGLWIDGET) 36 #elif defined (HAVE_QGLWIDGET)
39 # include <QGLWidget> 37 # include <QGLWidget>
40 # define OCTAVE_QT_OPENGL_WIDGET QGLWidget 38 # define OCTAVE_QT_OPENGL_WIDGET QGLWidget
41 # include <QGLFramebufferObject> 39 # include <QGLFramebufferObject>
42 # define OCTAVE_QT_OPENGL_FBO QGLFramebufferObject 40 # define OCTAVE_QT_OPENGL_FBO QGLFramebufferObject
87 void end_rendering (void); 85 void end_rendering (void);
88 86
89 octave::qopengl_functions m_glfcns; 87 octave::qopengl_functions m_glfcns;
90 octave::opengl_renderer m_renderer; 88 octave::opengl_renderer m_renderer;
91 89
92 # if defined (HAVE_QT_OFFSCREEN)
93 QOpenGLContext m_os_context; 90 QOpenGLContext m_os_context;
94 QOffscreenSurface m_os_surface; 91 QOffscreenSurface m_os_surface;
95 # endif
96 }; 92 };
97 93
98 OCTAVE_END_NAMESPACE(octave) 94 OCTAVE_END_NAMESPACE(octave)
99 95
100 #endif 96 #endif