diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2009-04-15 00:52:24 (GMT) |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2009-04-15 00:52:24 (GMT) |
| commit | 83cdc9150311e30d8a77e69f7546b88e1eb1bdc3 (patch) | |
| tree | 5270d085b55ab6994f107e4865e06b3c3d63f0e9 /src/opengl/qglpixelbuffer_mac.mm | |
| parent | 014af3e99616f9ee13ca365566828f7daf77a7f6 (diff) | |
| parent | bb7bddc47dd0748b45d22180d9e3c8e5209010b3 (diff) | |
| download | Qt-83cdc9150311e30d8a77e69f7546b88e1eb1bdc3.zip Qt-83cdc9150311e30d8a77e69f7546b88e1eb1bdc3.tar.gz Qt-83cdc9150311e30d8a77e69f7546b88e1eb1bdc3.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Diffstat (limited to 'src/opengl/qglpixelbuffer_mac.mm')
| -rw-r--r-- | src/opengl/qglpixelbuffer_mac.mm | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/opengl/qglpixelbuffer_mac.mm b/src/opengl/qglpixelbuffer_mac.mm index 14941ab..9a679b1 100644 --- a/src/opengl/qglpixelbuffer_mac.mm +++ b/src/opengl/qglpixelbuffer_mac.mm @@ -308,10 +308,6 @@ GLuint QGLPixelBuffer::generateDynamicTexture() const GLuint texture; glGenTextures(1, &texture); glBindTexture(GL_TEXTURE_2D, texture); - [static_cast<NSOpenGLContext *>(d->share_ctx) - setTextureImageToPixelBuffer:static_cast<NSOpenGLPixelBuffer *>(d->pbuf) - colorBuffer:GL_FRONT]; - glBindTexture(GL_TEXTURE_2D, texture); // updates texture target glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); @@ -322,8 +318,6 @@ GLuint QGLPixelBuffer::generateDynamicTexture() const GLuint texture; glGenTextures(1, &texture); glBindTexture(GL_TEXTURE_2D, texture); - aglTexImagePBuffer(d->share_ctx, d->pbuf, GL_FRONT); - glBindTexture(GL_TEXTURE_2D, texture); // updates texture target glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); return texture; |