diff options
| author | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-09-08 03:00:43 (GMT) |
|---|---|---|
| committer | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-09-08 03:00:43 (GMT) |
| commit | 2ed2632acec45ce4979ce21a0fe93d286a16613c (patch) | |
| tree | 58e5a824f874fffcf533e04dae1845ace2667cd0 /src/opengl/qpixmapdata_gl.cpp | |
| parent | 79ad2c1d4f5205245c929be1c0db2c678d185038 (diff) | |
| download | Qt-2ed2632acec45ce4979ce21a0fe93d286a16613c.zip Qt-2ed2632acec45ce4979ce21a0fe93d286a16613c.tar.gz Qt-2ed2632acec45ce4979ce21a0fe93d286a16613c.tar.bz2 | |
Add operator== and != to QGLFramebufferObjectFormat
Reviewed-by: Sarah Smith
Diffstat (limited to 'src/opengl/qpixmapdata_gl.cpp')
| -rw-r--r-- | src/opengl/qpixmapdata_gl.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/opengl/qpixmapdata_gl.cpp b/src/opengl/qpixmapdata_gl.cpp index d63d2ad..a394716 100644 --- a/src/opengl/qpixmapdata_gl.cpp +++ b/src/opengl/qpixmapdata_gl.cpp @@ -80,12 +80,7 @@ QGLFramebufferObject *QGLFramebufferObjectPool::acquire(const QSize &requestSize for (int i = 0; !chosen && i < m_fbos.size(); ++i) { QGLFramebufferObject *fbo = m_fbos.at(i); - QGLFramebufferObjectFormat format = fbo->format(); - if (format.samples() == requestFormat.samples() - && format.attachment() == requestFormat.attachment() - && format.textureTarget() == requestFormat.textureTarget() - && format.internalTextureFormat() == requestFormat.internalTextureFormat()) - { + if (fbo->format() == requestFormat) { // choose the fbo with a matching format and the closest size if (!candidate || areaDiff(requestSize, candidate) > areaDiff(requestSize, fbo)) candidate = fbo; |