| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
| |
Reviewed-by: Gunnar Sletta
|
| | |
|
| | |
|
| |
|
|
|
|
|
|
|
|
|
|
| |
If creating a QGLWidget triggers the creation of a QPixmap then we might
end up in an infinite recursion due to QPixmap trying to access
qt_gl_share_widget(). This can happen via setWindowIcon for example.
Adding an initializing flag to QGLGlobalShareWidget and preventing
QGLFramebufferObject::hasOpenGLFramebufferObjects() and
::hasOpenGLFramebufferBlit() from creating a QGLWidget every time they
are called with no active GL context.
Reviewed-by: Trond
|
| |\ |
|
| | |
| |
| |
| | |
Reviewed-by: Trust Me
|
| | |
| |
| |
| | |
Reviewed-by: trustme
|
| | |
|
| |
|
|
| |
Reviewed-by: trustme
|
| |
|
|
|
|
|
| |
Make sure makeCurrent() on a window surface unbinds any active FBO, and
simplify ensureActive() code in GL2 paint engine a bit. We don't need
the last_engine pointer as ensureActive() will take care of ensuring the
correct engine is active anway.
|
| | |
|
| |
|
|
|
|
| |
It seems GLint is typedefed to long on 10.4.
Reviewed-By: Rhys Weatherley
|
| |
|
|
|
|
|
| |
We need to use both qt_defaultDpiX and qt_defaultDpiY, and round
the resulting metric values.
Reviewed-by: Trond
|
| | |
|
| |
|
|
|
|
|
|
|
|
|
|
| |
Using GL 2 as default engine breaks the use cases where OpenGL commands
are inter-mixed with QPainter commands, such as when using raw OpenGL in
graphicsview.
For now we'll use the old OpenGL engine for QGLWidget, QGLPixelBuffer,
and QGLFramebufferObject on desktop, and the OpenGL 2 paint engine when
the OpenGL graphics system is used.
Reviewed-by: Trond
|
| |
|
|
|
|
|
| |
Compile both GL and GL2 paint engine on desktop, and choose between them
at run-time based on GL version flags.
Reviewed-by: Tom
|
| |\
| |
| |
| |
| | |
Conflicts:
src/gui/painting/qpaintengine_raster.cpp
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
Clean up the extension naming and make things build on OpenGL ES 2.0
again. All the extensions which made it into OpenGL 2.0 spec have have
the EXT postfix removed. This also eliminates defines on ES 2.0 as the
code now refers to the in-spec names.
Reviewed-by: sroedal
|
| |/ |
|
| |\ |
|
| | |
| |
| |
| |
| |
| |
| |
| | |
We now use FBOs to implement render-to-pixmap for the GL pixmap backend.
A multisample FBO is used for rendering, and is then blitted onto a
non-multisample FBO dynamically bound to the relevant texture.
Reviewed-by: Tom
|
| | |
| |
| |
| | |
The bottom-right coordinates are exclusive, not inclusive.
|
| |\ \
| |/
|/|
| |
| | |
Conflicts:
src/opengl/opengl.pro
|
| | |
| |
| |
| | |
Reviewed-by: trustme
|
| | |
| |
| |
| |
| | |
RevBy: Trond
Details: If there is already an active context we don't need a dummy widget.
|
| | |
| |
| |
| |
| |
| | |
RevBy: Trond
Details: Support GL_EXT_framebuffer_multisample and GL_EXT_framebuffer_blit
in the QGLFramebufferObject API.
|
| |/ |
|
| |
|
