yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

- Call GLTexture ctor

Browse source 
- Adjust texture lod bias after texture's been created (it's not created in init())

svn path=/trunk/KDE/kdebase/workspace/; revision=704983
This commit is contained in:
Rivo Laks 2007-08-26 19:47:18 +00:00
parent d9d5dddc3b
commit ae4bc5c53d
2 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
scene_opengl.cpp
View file

@ -732,12 +732,12 @@ void SceneOpenGL::windowOpacityChanged( Toplevel* )
// SceneOpenGL::Texture
//****************************************
SceneOpenGL::Texture::Texture()
SceneOpenGL::Texture::Texture() : GLTexture()
{
init();
}
SceneOpenGL::Texture::Texture( const Pixmap& pix, const QSize& size, int depth )
SceneOpenGL::Texture::Texture( const Pixmap& pix, const QSize& size, int depth ) : GLTexture()
{
init();
load( pix, size, depth );
@ -749,14 +749,18 @@ SceneOpenGL::Texture::~Texture()
void SceneOpenGL::Texture::init()
{
bind();
bound_glxpixmap = None;
}
void SceneOpenGL::Texture::createTexture()
{
glGenTextures( 1, &mTexture );
glBindTexture( mTarget, mTexture );
if( hasGLVersion( 1, 4, 0 ))
{
// Lod bias makes the trilinear-filtered texture look a bit sharper
glTexEnvf( GL_TEXTURE_FILTER_CONTROL, GL_TEXTURE_LOD_BIAS, -1.0f );
}
unbind();
}
void SceneOpenGL::Texture::discard()
@ -851,7 +855,7 @@ bool SceneOpenGL::Texture::load( const Pixmap& pix, const QSize& size,
if( tfp_mode )
{ // tfp mode, simply bind the pixmap to texture
if( mTexture == None )
glGenTextures( 1, &mTexture );
createTexture();
// when the pixmap is bound to the texture, they share the same data, so the texture
// updates automatically - no need to do anything in such case
if( bound_glxpixmap == None )
@ -890,8 +894,7 @@ bool SceneOpenGL::Texture::load( const Pixmap& pix, const QSize& size,
findTarget();
if( mTexture == None )
{
glGenTextures( 1, &mTexture );
glBindTexture( mTarget, mTexture );
createTexture();
y_inverted = false;
glTexImage2D( mTarget, 0, depth == 32 ? GL_RGBA : GL_RGB,
mSize.width(), mSize.height(), 0,
@ -942,8 +945,7 @@ bool SceneOpenGL::Texture::load( const Pixmap& pix, const QSize& size,
glDrawBuffer( GL_FRONT );
if( mTexture == None )
{
glGenTextures( 1, &mTexture );
glBindTexture( mTarget, mTexture );
createTexture();
y_inverted = false;
glCopyTexImage2D( mTarget, 0,
depth == 32 ? GL_RGBA : GL_RGB,

1
scene_opengl.h
View file

@ -104,6 +104,7 @@ class SceneOpenGL::Texture
protected:
void findTarget();
QRegion optimizeBindDamage( const QRegion& reg, int limit );
void createTexture();
private:
void init();