yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
7880 commits 3 branches 0 tags 96 MiB
Commit graph

7880 commits

This branch
This branch
All branches
Author SHA1 Message Date
Fredrik Höglund
2045e8dd34 kwin: Use the new setUniform() overloads in presentwindows 2011-02-11 00:41:19 +01:00
Fredrik Höglund
28cf355b26 kwin: Fix a bug in the fragment shaders 
The alpha channel must be set to 1 before the sample is modulated
with the brightness and opacity constants, not after.
 2011-02-11 00:39:47 +01:00
Fredrik Höglund
50e19e2cbc kwin: Simplify ShaderManager::resetShader() 2011-02-10 21:36:24 +01:00
Fredrik Höglund
5e97ccf7e0 kwin: Normalize the texcoords in the vertex shader 2011-02-10 20:15:23 +01:00
Fredrik Höglund
2fa966e0f9 kwin: Use the new setUniform() overloads in kwin core 2011-02-10 19:37:51 +01:00
Fredrik Höglund
85e9b6713f kwin: Add additional setUniform() overloads 
These are specialized overloads for setting the uniforms used
in the standard GLSL shaders in kwin.
 2011-02-10 19:16:04 +01:00
Fredrik Höglund
6a72efea96 kwin: Fix a typo in a setUniform() call 2011-02-10 18:47:52 +01:00
Nicolás Alvarez
bf5cf7440e Merge 4.6 into master. 
This is a "dummy" merge (-s ours), keeping the tree just as it was
in master. Everything in 4.6 was verified to be already forward-ported
into master, so we're not losing anything.

The purpose of this merge is to allow doing useful merges
from 4.6 to master later without getting a ton of conflicts.
 2011-02-08 14:38:33 -03:00
Dr. Robert Marmorstein
d87d4028c1 Fix kwin crash when using animated effects. 
BUG: 263383
 2011-02-07 21:05:40 -05:00
Dr. Robert Marmorstein
6ccf538f49 Merge branch 'master' of git://anongit.kde.org/kde-workspace 2011-02-07 20:16:13 -05:00
Marco Martin
a12acccd3b Merge branch 'master' into plasma/keyboard_applet_svgtext/mart 2011-02-07 20:10:26 +01:00
Martin Gräßlin
54a700ab05 Update HACKING file to kdelibs coding style. 
The complete HACKING file needs a rewrite...
 2011-02-07 19:58:21 +01:00
Martin Gräßlin
e1c04b7c3e Add shortcuts for new quick tile modes. 
Shortcuts for quick tile to the quarters of the screen
added in 4.6.
Thanks to Arthur Arlt for implementing this feature.
FEATURE: 265461
FIXED-IN: 4.7.0
CCMAIL: arre2000@gmx.de
 2011-02-07 19:19:51 +01:00
Script Kiddy
95c8ba2035 SVN_SILENT made messages (.desktop file) 2011-02-07 07:07:14 +01:00
Dr. Robert Marmorstein
6f695d9a76 Merge branch 'master' of git://anongit.kde.org/kde-workspace 2011-02-06 13:57:17 -05:00
Dr. Robert Marmorstein
b9d4794977 Fix kwin crash when using animated effects. 
Bug: 263383
 2011-02-06 13:47:30 -05:00
Thomas Lübking
b65f05f42b sanitize GL version stringlist 
BUG: 265131
 2011-02-06 17:21:56 +01:00
Thomas Lübking
c513099354 logout effect: remove deleted windows from list 
fwd port of 04831d049f73bb38694d7cecc4ea170b2a26a149
 2011-02-06 16:54:20 +01:00
Thomas Lübking
7b5683f74b explicitly trigger repaint on highlight window property changes 
forward port of 17934f79fa691a52efc4df142e5e8712634ad21a
 2011-02-06 16:50:47 +01:00
Thomas Lübking
eba4392272 Update deco buttons when allowed actions change 
BUG: 246442
 2011-02-06 16:42:45 +01:00
Thomas Lübking
51ee04837f whitespace: da3a0ad39be3cd5529b3d8b259065cd26e631a0b 
the other whitespace...
 2011-02-06 16:39:41 +01:00
Thomas Lübking
a3328bd449 export WindowGeometry config symbols 
BUG: 265272
 2011-02-06 16:36:16 +01:00
Script Kiddy
6cb8ffd7f6 SVN_SILENT made messages (.desktop file) 2011-02-06 12:23:07 +01:00
Martin Gräßlin
fc54bdfe89 Unbind shader before copying pixels to back buffer. 
This solves the regression with NVIDIA drivers resulting in a black screen.
Apparently NVIDIA does not support glXCopySubBuffer and the copying of pixels
fails with a shader bound.

So unbinding the shader before copying the pixels and rebinding the shader
afterwards resolves the issue.

This allows to remove the temporary hack to make NVIDIA work, again.
 2011-02-06 09:30:04 +01:00
Thomas Lübking
17dacb2290 strip qhash::operator[] from boxswitch 
possibly prevents leaking ItemInfos
secure some accesses (selected_window), not sure whether this caused the unreproducable crash when used as proxy in coverswitch
manual fwd port of 84384efb52367e720ad82ace04ac8da668afc5ec

CCBUG: 253079
 2011-02-06 00:53:22 +01:00
Thomas Lübking
ca5432aa93 remove delted windows from list. can happen and triggers kwin part of 
BUG: 265297
 2011-02-05 21:22:57 +01:00
Thomas Lübking
3c7bd4a5dd explicitly trigger minimal repaint on property change, otherwise broken when switching windows 2011-02-05 21:22:57 +01:00
Thomas Lübking
025a841e99 strip qhash::operator[] from boxswitch 
possibly prevents leaking ItemInfos
secure some accesses (selected_window), not sure whether this caused the unreproducable crash when used as proxy in coverswitch
CCBUG: 253079
 2011-02-05 20:12:00 +01:00
Martin Gräßlin
e2d4cba4c8 Temporarily workaround regression with NVIDIA. 
KWin's new shaders fail with NVIDIA and present just a black screen
for the ortho shader (generic shader seems to work). Temporarily
disabling the shaders to force a fallback to old rendering code.

Of course the bug in the shader needs to be fixed.
 2011-02-05 13:51:52 +01:00
Martin Gräßlin
0b6e47ea35 Readd the hack for Xgl in findTarget. 
Apparently glXQueryDrawable does not work in NVIDIA blob for binding
a texture from an icon. This fixes an abort, but the root cause should
be found and fixed properly.
 2011-02-05 13:51:52 +01:00
Martin Gräßlin
9865608fb3 Fix a merge regression in Texture::release. 
Seems to be a lost change caused by rebasing moved code.
 2011-02-05 13:51:52 +01:00
Fredrik Höglund
d4ba7b5e6b kwin: Fix the glBlendFunc() in the shader case. 
The RGB values were being multiplied by the alpha value twice.
 2011-02-05 13:51:52 +01:00
Martin Gräßlin
154e3e61b0 Temporarily workaround regression with NVIDIA. 
KWin's new shaders fail with NVIDIA and present just a black screen
for the ortho shader (generic shader seems to work). Temporarily
disabling the shaders to force a fallback to old rendering code.

Of course the bug in the shader needs to be fixed.
 2011-02-05 12:06:32 +01:00
Martin Gräßlin
e1ecce3da7 Readd the hack for Xgl in findTarget. 
Apparently glXQueryDrawable does not work in NVIDIA blob for binding
a texture from an icon. This fixes an abort, but the root cause should
be found and fixed properly.
 2011-02-05 11:56:48 +01:00
Martin Gräßlin
42f4e65543 Fix a merge regression in Texture::release. 
Seems to be a lost change caused by rebasing moved code.
 2011-02-05 11:55:10 +01:00
Marco Martin
ad0c869c7f Merge branch 'plasma/keyboard_applet_svgtext/mart' 2011-02-04 23:54:34 +01:00
Marco Martin
783cde7bbd Merge remote branch 'origin/master' into plasma/keyboard_applet_svgtext/mart 2011-02-04 22:40:07 +01:00
Fredrik Höglund
2a6a4e9667 kwin: Fix the glBlendFunc() in the shader case. 
The RGB values were being multiplied by the alpha value twice.
 2011-02-04 21:44:50 +01:00
Fredrik Höglund
03ba96420a kwin: Add overloads for setUniform() that take a location. 2011-02-04 21:23:29 +01:00
Martin Gräßlin
9bfef5d4ca Drop addQuadVertices from kwinglutils. 
KWin does not use GL_QUADS anymore for rendering windows.
This makes this method rather useless and isn't used anywhere either.
 2011-02-04 21:23:29 +01:00
Martin Gräßlin
9814a8e81b Remove renderGLGeometry from kwinglutils. 
Not used anymore - completely replaced by VBO.
 2011-02-04 21:23:29 +01:00
Fredrik Höglund
5cbd1d458b kwin: Static member variables shouldn't have the m prefix. 2011-02-04 21:23:29 +01:00
Fredrik Höglund
cf58a57cf4 kwin: Fix a compiler warning about initialization order. 2011-02-04 21:23:29 +01:00
Fredrik Höglund
4dd9ef3327 kwin: Clean up the shader compilation code a bit. 2011-02-04 21:23:29 +01:00
Fredrik Höglund
ca8857a4d9 kwin: Change the shader source code parameters from QStrings to QByteArrays. 
This eliminates the QByteArray -> QString -> QByteArray conversions.
 2011-02-04 21:23:28 +01:00
Fredrik Höglund
8bc586e613 kwin: Add overloads for setUniform() that take a location. 2011-02-04 19:57:19 +01:00
Martin Gräßlin
859dadffd8 Drop addQuadVertices from kwinglutils. 
KWin does not use GL_QUADS anymore for rendering windows.
This makes this method rather useless and isn't used anywhere either.
 2011-02-04 19:46:20 +01:00
Martin Gräßlin
2e2a7948fb Remove renderGLGeometry from kwinglutils. 
Not used anymore - completely replaced by VBO.
 2011-02-04 19:38:27 +01:00
Fredrik Höglund
f7633fff23 kwin: Static member variables shouldn't have the m prefix. 2011-02-04 17:32:13 +01:00
Fredrik Höglund
9dfc0332c6 kwin: Fix a compiler warning about initialization order. 2011-02-04 17:06:28 +01:00