[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/work/kwin_composite
From:       Rivo Laks <rivolaks () hot ! ee>
Date:       2007-04-29 15:39:36
Message-ID: 1177861176.702491.6390.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 659155 by rivol:

Well, actually GLRenderTarget doesn't require NPOT textures (it works with rectangle \
textures as well). That also means that those effects which do require NPOT have to \
check for it themselves.

 M  +1 -1      effects/demo_liquid.cpp  
 M  +1 -1      effects/test_fbo.cpp  
 M  +3 -3      lib/kwinglutils.cpp  


--- branches/work/kwin_composite/effects/demo_liquid.cpp #659154:659155
@@ -78,7 +78,7 @@
 
 bool LiquidEffect::supported()
     {
-    return GLRenderTarget::supported() &&
+    return GLRenderTarget::supported() && GLTexture::NPOTTextureSupported() &&
             GLShader::fragmentShaderSupported() &&
             (effects->compositingType() == OpenGLCompositing);
     }
--- branches/work/kwin_composite/effects/test_fbo.cpp #659154:659155
@@ -43,7 +43,7 @@
 
 bool TestFBOEffect::supported()
     {
-    return GLRenderTarget::supported() &&
+    return GLRenderTarget::supported() && GLTexture::NPOTTextureSupported() &&
             (effects->compositingType() == OpenGLCompositing);
     }
 
--- branches/work/kwin_composite/lib/kwinglutils.cpp #659154:659155
@@ -720,8 +720,7 @@
 
 void GLRenderTarget::initStatic()
     {
-    mSupported = hasGLExtension("GL_EXT_framebuffer_object") && \
                glFramebufferTexture2D &&
-            GLTexture::NPOTTextureSupported();
+    mSupported = hasGLExtension("GL_EXT_framebuffer_object") && \
glFramebufferTexture2D;  }
 
 GLRenderTarget::GLRenderTarget(GLTexture* color)
@@ -781,7 +780,8 @@
     glGenFramebuffers(1, &mFramebuffer);
     glBindFramebuffer(GL_FRAMEBUFFER_EXT, mFramebuffer);
 
-    glFramebufferTexture2D(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, \
GL_TEXTURE_2D, mTexture->texture(), 0); +    \
glFramebufferTexture2D(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, +                \
mTexture->target(), mTexture->texture(), 0);  
     GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER_EXT);
     if(status != GL_FRAMEBUFFER_COMPLETE_EXT)


[prev in list] [next in list] [prev in thread] [next in thread]