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

Generate correct tex coordinates for rendering a texture.

Browse source 
This way we can get rid of the texture matrix transformations when rendering a standard texture - no matter if it's inverted or not.

svn path=/trunk/KDE/kdebase/workspace/; revision=1152649
This commit is contained in:
Martin Gräßlin 2010-07-21 16:36:26 +00:00
parent d8ca06d029
commit b296b7a00c
1 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
lib/kwinglutils.cpp
View file

@ -520,19 +520,17 @@ void GLTexture::render( QRegion region, const QRect& rect )
};
const float texcoords[ 4 * 2 ] =
{
0.0f, 1.0f, // y needs to be swapped (normalized coords)
0.0f, 0.0f,
1.0f, 1.0f,
1.0f, 0.0f
0.0f, y_inverted ? 0.0f : 1.0f, // y needs to be swapped (normalized coords)
0.0f, y_inverted ? 1.0f : 0.0f,
1.0f, y_inverted ? 0.0f : 1.0f,
1.0f, y_inverted ? 1.0f : 0.0f
};
m_vbo->setData( 4, 2, verts, texcoords );
}
}
if( m_vbo )
{
enableNormalizedTexCoords();
m_vbo->render( region, GL_TRIANGLE_STRIP );
disableNormalizedTexCoords();
}
else
{
@ -545,14 +543,12 @@ void GLTexture::render( QRegion region, const QRect& rect )
};
const float texcoords[ 4 * 2 ] =
{
0, 1, // y needs to be swapped (normalized coords)
0, 0,
1, 0,
1, 1
0.0f, y_inverted ? 0.0f : 1.0f, // y needs to be swapped (normalized coords)
0.0f, y_inverted ? 1.0f : 0.0f,
1.0f, y_inverted ? 1.0f : 0.0f,
1.0f, y_inverted ? 0.0f : 1.0f
};
enableNormalizedTexCoords();
renderGLGeometry( region, 4, verts, texcoords );
disableNormalizedTexCoords();
}
}