diff options
| author | Samuel Rødal <sroedal@trolltech.com> | 2009-09-04 11:20:52 (GMT) |
|---|---|---|
| committer | Samuel Rødal <sroedal@trolltech.com> | 2009-09-04 11:30:08 (GMT) |
| commit | 9d85dcf10d580a45c261e3e1a8d8df7d41cb9437 (patch) | |
| tree | e76fdbf00784369987304df12a03bf38801566fc /src/opengl/qpixmapdata_gl.cpp | |
| parent | 74cb4b7ca71e64d08fab7d4e00a15e29fa339f5b (diff) | |
| download | Qt-9d85dcf10d580a45c261e3e1a8d8df7d41cb9437.zip Qt-9d85dcf10d580a45c261e3e1a8d8df7d41cb9437.tar.gz Qt-9d85dcf10d580a45c261e3e1a8d8df7d41cb9437.tar.bz2 | |
Slightly improved QGLFramebufferObjectFormat API.
Renaming setInternalFormat() to setInternalTextureFormat() (and
similarly for the accessor) makes the API a bit more explicit.
Reviewed-by: Trond
Diffstat (limited to 'src/opengl/qpixmapdata_gl.cpp')
| -rw-r--r-- | src/opengl/qpixmapdata_gl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/opengl/qpixmapdata_gl.cpp b/src/opengl/qpixmapdata_gl.cpp index b6f5012..d63d2ad 100644 --- a/src/opengl/qpixmapdata_gl.cpp +++ b/src/opengl/qpixmapdata_gl.cpp @@ -84,7 +84,7 @@ QGLFramebufferObject *QGLFramebufferObjectPool::acquire(const QSize &requestSize if (format.samples() == requestFormat.samples() && format.attachment() == requestFormat.attachment() && format.textureTarget() == requestFormat.textureTarget() - && format.internalFormat() == requestFormat.internalFormat()) + && format.internalTextureFormat() == requestFormat.internalTextureFormat()) { // choose the fbo with a matching format and the closest size if (!candidate || areaDiff(requestSize, candidate) > areaDiff(requestSize, fbo)) @@ -467,7 +467,7 @@ QPaintEngine* QGLPixmapData::paintEngine() const QGLFramebufferObjectFormat format; format.setAttachment(QGLFramebufferObject::CombinedDepthStencil); format.setSamples(4); - format.setInternalFormat(GLenum(m_hasAlpha ? GL_RGBA : GL_RGB)); + format.setInternalTextureFormat(GLenum(m_hasAlpha ? GL_RGBA : GL_RGB)); m_renderFbo = qgl_fbo_pool()->acquire(size(), format); |