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

8055 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Fredrik Höglund
f21ccf028a kwin: Clean up the shader compilation code a bit. 2011-02-04 17:03:56 +01:00
Fredrik Höglund
9f41472085 kwin: Change the shader source code parameters from QStrings to QByteArrays. 
This eliminates the QByteArray -> QString -> QByteArray conversions.
 2011-02-04 16:41:55 +01:00
Script Kiddy
d3b5344355 SVN_SILENT made messages (.desktop file) 2011-02-04 12:29:37 +01:00
Christoph Thielecke
f95b82a907 define missing macros for systems which have only EXT defines. 
these are:
- GL_FRAMEBUFFER
- GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT
- GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT
- GL_FRAMEBUFFER_UNSUPPORTED
- GL_COLOR_ATTACHMENT0
- GL_FRAMEBUFFER_COMPLETE
 2011-02-04 08:34:19 +01:00
Script Kiddy
b90312c031 SVN_SILENT made messages (.desktop file) 2011-02-04 06:46:03 +01:00
Martin Gräßlin
d9dc5afae4 Only link against GLES if building for GLES. 
It took me two hours to figure out that kwineffects linked the GLES libraries
and that was causing my kwin not to work :-(
 2011-02-03 22:30:14 +01:00
Aaron Seigo
3adf8a9c65 Merge remote branch 'origin/master' into aseigo/activityrunner 2011-02-03 11:42:25 -08:00
Script Kiddy
15155326e2 SVN_SILENT made messages (.desktop file) 2011-02-03 07:25:47 +01:00
Aaron Seigo
be2c8d5b45 Merge branch 'master' into aseigo/activityrunner 2011-02-02 14:22:52 -08:00
Script Kiddy
b6a47a04f2 SVN_SILENT made messages (.desktop file) 2011-02-02 14:15:33 -08:00
Hugo Pereira Da Costa
488b3644d5 Changed handling of shadow overlap with window content 
Oxygen::ShadowCache::shadowSize() now returns the shadow extend outside of the window body (the extend)
Overlab between the actual shadow pixmap and the window body is dealt with internally (by creating larger pixmaps)
This allows notably Oxygen::Client to not attempt to draw shadow when shadowSize == 0 (which was never the case
before)
 2011-02-02 17:23:08 +01:00
Hugo Pereira Da Costa
c1ff9525e3 Removed obsolete ShadowCache::Key::useOxygenShadows flag 
The flag has been made obsolete by the fact that window corners are not part of the shadow anymore.
Configuration::useOxygenShadows is now dealt with by setting the active flag directly.
 2011-02-02 17:21:12 +01:00
Script Kiddy
40eb7e9409 SVN_SILENT made messages (.desktop file) 2011-02-02 14:01:48 +01:00
Script Kiddy
b637e9d7ca SVN_SILENT made messages (.desktop file) 2011-02-02 08:26:11 +01:00
Martin Gräßlin
27c2b599b7 Bump the effects API version for 4.7. 
Better late than never. As always keeping a buffer for API breaks in stable branch.
 2011-02-01 23:05:21 +01:00
Martin Gräßlin
54c0a913b9 Fixing broken Invert effect build. 
Forgot to remove the header file for shadereffect, though
it was not used anymore in the effect.
CCMAIL: hein@kde.org
 2011-02-01 20:13:26 +01:00
Eike Hein
39f57a472f Disable the invert effect to unbreak the workspace build. 
invert.cpp refers to the apparently removed kwinshadereffect.h,
so it's probably missing out on some sort of porting activity.

CCMAIL:kde@martin-graesslin.com
 2011-02-01 19:52:03 +01:00
Fredrik Höglund
09dc033e8c kwin: Use QDateTime::currentMSecsSinceEpoch() instead of QTime::currentTime(). 2011-02-01 16:38:06 +01:00
Fredrik Höglund
2d81d28e7a kwin: Use QBasicTimer instead of managing the timer ID manually. 2011-02-01 16:35:51 +01:00
Montel Laurent
91bf3ab073 Fix ui files 2011-02-01 13:16:06 +01:00
Martin Gräßlin
bf8c67c156 Merge branch 'kwin-coding-style' 2011-01-31 22:08:08 +01:00
Martin Gräßlin
c0c7255751 Merge branch 'kwin-cleanup' 2011-01-31 22:07:53 +01:00
Martin Gräßlin
7132f5cdbc Merge branch 'kwin-gles' 2011-01-31 22:07:39 +01:00
Martin Gräßlin
0a7e48f7aa KWin uses kdelibs coding style. 2011-01-31 20:07:03 +01:00
Kevin Ottens
de2c5b91f1 The demo needs to find the lib oxygen headers. 2011-01-30 17:34:15 +01:00
Fredrik Höglund
1a5b3b4bea Disable and delete the fragment program if it fails to compile. 
svn path=/branches/KDE/4.6/kdebase/workspace/; revision=1215777
 2011-01-30 15:25:01 +01:00
Fredrik Höglund
8bc99e68c0 Don't specify the texture target explicitly with r300g. 
This is reported to cause a performance regression.

FIXED-IN: 4.6.0
BUG: 256654

svn path=/branches/KDE/4.6/kdebase/workspace/; revision=1215519
 2011-01-30 15:24:31 +01:00
Fredrik Höglund
bfa2fc68e6 Rewrite the ARB lanczos shader to work with the Radeon R300 limitations. 
svn path=/branches/KDE/4.6/kdebase/workspace/; revision=1215505
 2011-01-30 15:11:22 +01:00