Commit graph

279 commits

Author SHA1 Message Date
Luboš Luňák
930a9248c9 Repainting of only changed areas, now also for OpenGL.
svn path=/branches/work/kwin_composite/; revision=606272
2006-11-19 20:29:41 +00:00
Luboš Luňák
b956650b2d Make some aspects affecting performance configurable in kwinrc,
group [Translucency]:
GLMode=TFP|SHM|Fallback - select rendering mode
GLAlwaysRebind=<bool> - force rebinding a texture
GLDirect=<bool> - direct rendering
CCMAIL: kwin@kde.org


svn path=/branches/work/kwin_composite/; revision=606268
2006-11-19 20:13:49 +00:00
Luboš Luňák
6e54bae328 Try to reduce number of roundtrips in SHM mode by merging
region rectangles.


svn path=/branches/work/kwin_composite/; revision=606267
2006-11-19 20:10:25 +00:00
Luboš Luňák
8100c40188 Remove unused code.
svn path=/branches/work/kwin_composite/; revision=606261
2006-11-19 20:02:25 +00:00
Luboš Luňák
186fded142 Use glPush/PopAttrib() instead of glIs*().
svn path=/branches/work/kwin_composite/; revision=605476
2006-11-16 21:40:10 +00:00
Luboš Luňák
8e257f251f Use kwin debug area.
svn path=/branches/work/kwin_composite/; revision=605290
2006-11-16 09:05:40 +00:00
Luboš Luňák
a35cf8e954 Try to use direct rendering.
svn path=/branches/work/kwin_composite/; revision=605288
2006-11-16 09:02:03 +00:00
Luboš Luňák
9d25cf5166 SHM mode, using MIT-SHM extension for Pixmap->image data conversions
and glTexImage texture creation. Stolen from Beryl (stolen from Looking Glass).
Not faster than TFP but faster then the original fallback glCopyTexImage
mode from glcompmgr.


svn path=/branches/work/kwin_composite/; revision=605283
2006-11-16 08:36:30 +00:00
Luboš Luňák
f33683df3f A different workaround for ATI (http://lists.kde.org/?l=kwin&m=116353772208535&w=2).
svn path=/branches/work/kwin_composite/; revision=605278
2006-11-16 07:57:55 +00:00
Luboš Luňák
9bfae71d45 Support for strict binding for AIGLX, although currently not needed.
svn path=/branches/work/kwin_composite/; revision=605274
2006-11-16 07:46:39 +00:00
Luboš Luňák
0bd186ec72 Support GLX 1.2 (no glXCreateWindow() functionality).
svn path=/branches/work/kwin_composite/; revision=604877
2006-11-14 13:18:53 +00:00
Luboš Luňák
1be2c4ed32 Detect and check GLX version/extensions.
svn path=/branches/work/kwin_composite/; revision=604805
2006-11-14 11:52:20 +00:00
Luboš Luňák
9a706bea89 Remove one more part of direct OpenGL drawing to the root window.
svn path=/branches/work/kwin_composite/; revision=604021
2006-11-11 09:14:38 +00:00
Luboš Luňák
340e64ab51 With the overlay fix double-buffering now works too.
Also dump drawing directly into the root window, OpenGL normally
clips the root window, so nothing is drawn. NVidia has "DisableGLXRootClipping",
but there's no way to detect that and there's still the non-db mode.


svn path=/branches/work/kwin_composite/; revision=604019
2006-11-11 09:11:51 +00:00
Luboš Luňák
60d343f1d7 A great idea from Cedric Borgese: Instead of transforming
the OpenGL scene to match X coordinate system, adjust it
directly using glOrtho().


svn path=/branches/work/kwin_composite/; revision=603929
2006-11-10 20:27:44 +00:00
Luboš Luňák
001ddfacbd Remove requiring GLX_DRAWABLE_TYPE to include GLX_PIXMAP_BIT,
ATI seems to be buggy and it doesn't seem to be really necessary.


svn path=/branches/work/kwin_composite/; revision=603922
2006-11-10 20:01:24 +00:00
Luboš Luňák
bcfc36c695 Work around ATI crashes.
svn path=/branches/work/kwin_composite/; revision=603713
2006-11-09 20:48:12 +00:00
Luboš Luňák
1cc603cf75 Abort if there are problems with setting up OpenGL context.
svn path=/branches/work/kwin_composite/; revision=603712
2006-11-09 20:38:14 +00:00
Luboš Luňák
aeafa63a94 Move some OpenGL code to glutils.* .
Add support for changing window brightness.
Add DialogParent effect that makes windows that are unaccessible because
of modal dialogs darker.
Patch by Rivo Laks.


svn path=/branches/work/kwin_composite/; revision=603384
2006-11-08 19:10:07 +00:00
Luboš Luňák
d3fc0bbc09 Add support for changing saturation. Patch by Rivo Laks.
svn path=/branches/work/kwin_composite/; revision=603145
2006-11-07 23:33:23 +00:00
Luboš Luňák
368c97ac96 Debug about visuals used.
svn path=/branches/work/kwin_composite/; revision=603143
2006-11-07 23:21:08 +00:00
Luboš Luňák
8d777cb1f7 Double-buffering using OpenGL doesn't work and I have no idea why.
svn path=/branches/work/kwin_composite/; revision=603138
2006-11-07 22:45:56 +00:00
Luboš Luňák
4110fc1c3a Support for XComposite overlay window.
svn path=/branches/work/kwin_composite/; revision=603137
2006-11-07 22:44:39 +00:00
Luboš Luňák
f631e57a01 Bind the texture also in the global context and some opengl<->x
synchronizing.


svn path=/branches/work/kwin_composite/; revision=603127
2006-11-07 22:11:53 +00:00
Luboš Luňák
5245ef9e10 In non-tfp mode, a different context must be used when doing opengl
operations with the window drawable. Patch by Philip Falkner.


svn path=/branches/work/kwin_composite/; revision=603122
2006-11-07 22:04:57 +00:00
Luboš Luňák
2150cae758 svn revert r603055, it's nonsense
svn path=/branches/work/kwin_composite/; revision=603098
2006-11-07 20:33:52 +00:00
Luboš Luňák
e99a883a81 Require configs with no caveats. Manual replacement for glXChooseFBConfig()
is really needed :-/.


svn path=/branches/work/kwin_composite/; revision=603064
2006-11-07 17:51:15 +00:00
Luboš Luňák
f63e9e2b5b Fix last commit.
svn path=/branches/work/kwin_composite/; revision=603058
2006-11-07 17:33:53 +00:00
Luboš Luňák
6e3f0f7bbe Blah, destination drawable doesn't need alpha channel.
svn path=/branches/work/kwin_composite/; revision=603056
2006-11-07 17:31:34 +00:00
Luboš Luňák
5b7ef47746 Check root visual also when trying to find non-db config.
svn path=/branches/work/kwin_composite/; revision=603055
2006-11-07 17:27:58 +00:00
Luboš Luňák
2cd4ab9034 Fix Beryl SVN URL.
svn path=/branches/work/kwin_composite/; revision=601726
2006-11-04 08:11:01 +00:00
Luboš Luňák
8188d48bea Include urls for the opengl docs.
svn path=/branches/work/kwin_composite/; revision=601302
2006-11-02 20:21:34 +00:00
Luboš Luňák
245df12129 But that doesn't compile here. According to http://www.opengl.org/registry/ABI/
the right header for GLX extensions is GL/glxext.h . If it still doesn't
compile somewhere, it probably needs conditional compilation.


svn path=/branches/work/kwin_composite/; revision=601182
2006-11-02 12:57:10 +00:00
Tim Beaulen
4e34c8f0b3 Build
The errors I got:

[ 28%] Building CXX object workspace/kwin/CMakeFiles/kdeinit_kwin.dir/scene_opengl.o
/home/kde4dev/kde/src/kdebase/workspace/kwin/scene_opengl.cpp:162: error: 'GLX_BIND_TO_TEXTURE_RGBA_EXT' was not declared in this scope
/home/kde4dev/kde/src/kdebase/workspace/kwin/scene_opengl.cpp: In member function 'void KWinInternal::SceneOpenGL::Window::bindTexture()':
/home/kde4dev/kde/src/kdebase/workspace/kwin/scene_opengl.cpp:500: error: 'GLX_FRONT_LEFT_EXT' was not declared in this scope
/home/kde4dev/kde/src/kdebase/workspace/kwin/scene_opengl.cpp:506: error: 'GLX_TEXTURE_FORMAT_EXT' was not declared in this scope
/home/kde4dev/kde/src/kdebase/workspace/kwin/scene_opengl.cpp:506: error: 'GLX_TEXTURE_FORMAT_RGBA_EXT' was not declared in this scope
/home/kde4dev/kde/src/kdebase/workspace/kwin/scene_opengl.cpp:512: error: 'GLX_Y_INVERTED_EXT' was not declared in this scope
/home/kde4dev/kde/src/kdebase/workspace/kwin/scene_opengl.cpp:515: error: 'GLX_FRONT_LEFT_EXT' was not declared in this scope
/home/kde4dev/kde/src/kdebase/workspace/kwin/scene_opengl.cpp: In member function 'void KWinInternal::SceneOpenGL::Window::discardTexture()':
/home/kde4dev/kde/src/kdebase/workspace/kwin/scene_opengl.cpp:568: error: 'GLX_FRONT_LEFT_EXT' was not declared in this scope
make[2]: *** [workspace/kwin/CMakeFiles/kdeinit_kwin.dir/scene_opengl.o] Error 1
make[1]: *** [workspace/kwin/CMakeFiles/kdeinit_kwin.dir/all] Error 2
make: *** [all] Error 2
kde4dev@localhost ~/kde/src/k


svn path=/branches/work/kwin_composite/; revision=601177
2006-11-02 12:06:47 +00:00
Luboš Luňák
12731982bb Does compositing/opengl work with gfx cards other than nvidia?
svn path=/branches/work/kwin_composite/; revision=600732
2006-10-31 15:28:38 +00:00
Luboš Luňák
bf0256bf1b Fix compile.
svn path=/branches/work/kwin_composite/; revision=600688
2006-10-31 13:20:51 +00:00
Luboš Luňák
d92d3a8165 Document the compositing framework and the scene backends,
describe the design, add links to external docs.
Restructure COMPOSITE_TODO into sections and add sort of priorities.


svn path=/branches/work/kwin_composite/; revision=600163
2006-10-29 19:23:45 +00:00
Luboš Luňák
3f9b754ee7 Add post-painting pass to be used for triggering
repaints with animations.


svn path=/branches/work/kwin_composite/; revision=600156
2006-10-29 19:07:10 +00:00
Luboš Luňák
05021ecedb Fix crash with unmanaged windows.
svn path=/branches/work/kwin_composite/; revision=598783
2006-10-24 15:54:52 +00:00
Luboš Luňák
548eb09a74 Move shared code to base class.
svn path=/branches/work/kwin_composite/; revision=598752
2006-10-24 13:38:31 +00:00
Luboš Luňák
189ca6c3a2 Fix window scaling (apply scale before translating).
svn path=/branches/work/kwin_composite/; revision=598743
2006-10-24 12:50:22 +00:00
Luboš Luňák
1d7b94acfc Basic window transformations.
svn path=/branches/work/kwin_composite/; revision=597997
2006-10-22 10:15:19 +00:00
Luboš Luňák
779597a648 Basic screen transformation.
svn path=/branches/work/kwin_composite/; revision=597815
2006-10-21 18:07:00 +00:00
Luboš Luňák
fef4dec6e6 Add COPY_BUFFER workaround from glcompmgr that makes this work
even with stable 8776 nvidia drivers (the beta ones lock up on me
from time to time with multiple X running).


svn path=/branches/work/kwin_composite/; revision=597767
2006-10-21 15:23:01 +00:00
Luboš Luňák
daa8f7eccc Fix texture mapping.
svn path=/branches/work/kwin_composite/; revision=597757
2006-10-21 15:06:09 +00:00
Luboš Luňák
ddab4e0d2c Move functionality to the base Scene class.
svn path=/branches/work/kwin_composite/; revision=596186
2006-10-16 21:06:34 +00:00
Luboš Luňák
caed149f40 Add pre-paint passes that will allow finding out how the painting will be done.
svn path=/branches/work/kwin_composite/; revision=596109
2006-10-16 18:46:07 +00:00
Luboš Luňák
338adc9ad5 Throw away old code for effects and start anew.
svn path=/branches/work/kwin_composite/; revision=595965
2006-10-16 10:12:48 +00:00
Luboš Luňák
066a4583d7 Switch back to modelview matrix mode.
svn path=/branches/work/kwin_composite/; revision=595801
2006-10-15 18:00:52 +00:00
Luboš Luňák
d547cf8cd4 Move duplicated functionality to the base class.
svn path=/branches/work/kwin_composite/; revision=595639
2006-10-15 08:58:38 +00:00
Luboš Luňák
fef8c89b93 Don't bind the texture if not necessary.
svn path=/branches/work/kwin_composite/; revision=595561
2006-10-14 20:50:24 +00:00
Luboš Luňák
17e46e32fb Separate more generic and simple screen paint.
svn path=/branches/work/kwin_composite/; revision=595559
2006-10-14 20:46:47 +00:00
Luboš Luňák
004d781e32 For simple paint, clip by above windows. A missing todo is to still
update only changed areas instead of doing full glXSwapBuffers()
when possible.


svn path=/branches/work/kwin_composite/; revision=595357
2006-10-14 07:15:23 +00:00
Luboš Luňák
b60b847e25 Dump usage of depth buffer, Compiz manages to do just with
clipping.


svn path=/branches/work/kwin_composite/; revision=595349
2006-10-14 06:33:38 +00:00
Luboš Luňák
e8e16726c1 Prepare for optimized painting cases.
svn path=/branches/work/kwin_composite/; revision=594955
2006-10-12 21:49:54 +00:00
Luboš Luňák
392acfb28c A really nice trick from Compiz. OpenGL coordinates have Y upside
down ( [0,0] is bottomleft, unlike topleft with X ), so simply
flip the whole scene upside down and move it up -> the coordinates
match, except for when mapping pixmap to textures.


svn path=/branches/work/kwin_composite/; revision=594942
2006-10-12 21:12:51 +00:00
Luboš Luňák
5de53a53e6 A new way of adjusting opacity of non-alpha windows from glcompmgr,
the alpha way doesn't work with TFP for some reason.


svn path=/branches/work/kwin_composite/; revision=594941
2006-10-12 21:12:13 +00:00
Luboš Luňák
259cf5e401 Use glXGetProcAddress().
svn path=/branches/work/kwin_composite/; revision=594141
2006-10-10 09:16:57 +00:00
Luboš Luňák
dac02f69c6 Support for double-buffered output, can't really test it here though.
svn path=/branches/work/kwin_composite/; revision=593722
2006-10-08 20:31:00 +00:00
Luboš Luňák
4cbf58f8ea Small fixes.
svn path=/branches/work/kwin_composite/; revision=593721
2006-10-08 20:30:02 +00:00
Luboš Luňák
0858d34ed1 GLX_EXT_texture_from_pixmap working.
svn path=/branches/work/kwin_composite/; revision=593460
2006-10-07 21:23:46 +00:00
Luboš Luňák
71b0978628 Separate function for finding right GLXFBConfig.
svn path=/branches/work/kwin_composite/; revision=593458
2006-10-07 21:22:59 +00:00
Luboš Luňák
4a18e30518 Use the X way of handling ARGB windows with decorations
here as well.


svn path=/branches/work/kwin_composite/; revision=593457
2006-10-07 21:22:24 +00:00
Luboš Luňák
9941ae2cea Windows with only shaped decorations are also shaped
from the compositing point of view.


svn path=/branches/work/kwin_composite/; revision=593455
2006-10-07 21:21:45 +00:00
Luboš Luňák
b168c35384 Don't cache window pixmap, it's used only after it
changes.


svn path=/branches/work/kwin_composite/; revision=593453
2006-10-07 21:20:23 +00:00
Luboš Luňák
06203d0652 Don't bother with trying to transform window damage,
when there are any transformations, it should simply
repaint everything (todo).


svn path=/branches/work/kwin_composite/; revision=593450
2006-10-07 21:18:36 +00:00
Luboš Luňák
db41dd99cd Finally found some way how to handle together ARGB windows
and RGB decorations, although there's probably a better
way than this.


svn path=/branches/work/kwin_composite/; revision=593446
2006-10-07 21:16:38 +00:00
Luboš Luňák
b1a526960f Don't cache the window pixmap, it doesn't make any difference.
svn path=/branches/work/kwin_composite/; revision=593445
2006-10-07 21:14:57 +00:00
Luboš Luňák
fb73a2070a Fix compile.
svn path=/branches/work/kwin_composite/; revision=591156
2006-10-01 21:45:46 +00:00
Luboš Luňák
f14000b7fb Implement all missing Scene virtuals.
svn path=/branches/work/kwin_composite/; revision=591145
2006-10-01 21:14:53 +00:00
Luboš Luňák
b59701f608 Nicer handling of second phase painting.
svn path=/branches/work/kwin_composite/; revision=591144
2006-10-01 21:12:58 +00:00
Luboš Luňák
a283f9f9c0 Replace the opacity hack from glcompmgr with code from compiz.
svn path=/branches/work/kwin_composite/; revision=591143
2006-10-01 21:11:45 +00:00
Luboš Luňák
d65ebbcb5f Opengl transparency.
svn path=/branches/work/kwin_composite/; revision=590751
2006-09-30 18:09:41 +00:00
Luboš Luňák
ace6b4ad8a Opengl support for shaped windows.
svn path=/branches/work/kwin_composite/; revision=590728
2006-09-30 17:28:27 +00:00
Luboš Luňák
fba72ecdfe Update only damaged areas.
svn path=/branches/work/kwin_composite/; revision=590678
2006-09-30 16:17:54 +00:00
Luboš Luňák
649887d6c2 Looks like using XserverRegion for keeping damage regions
wasn't that good idea. Changed to QRegion.


svn path=/branches/work/kwin_composite/; revision=590648
2006-09-30 15:40:03 +00:00
Luboš Luňák
f3119d2550 Some opengl error checking.
svn path=/branches/work/kwin_composite/; revision=590566
2006-09-30 13:37:28 +00:00
Luboš Luňák
1c7e7bb2b7 Keeping scene-related data in opengl scene.
svn path=/branches/work/kwin_composite/; revision=590319
2006-09-29 19:05:36 +00:00
Luboš Luňák
efff218441 A very crude OpenGL-based compositing code.
svn path=/branches/work/kwin_composite/; revision=590265
2006-09-29 16:49:34 +00:00