benkyd/picom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,100 Commits 4 Branches 0 Tags
387e247bcf0d7f4d0e9c6fef015740f174afe84d
Commit Graph

140 Commits

Author SHA1 Message Date
Yuxuan Shui
a52f95acd7 gl_common: fix misunderstanding of VAO 
GL_ARRAY_BUFFER is not part of VAO state.

This shouldn't affect compton's behaviour at all, though.

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-06-24 01:51:50 +01:00
Yuxuan Shui
85abdef765 gl_common: use explicit vertex attrib loction 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-06-24 01:34:12 +01:00
Yuxuan Shui
67f0ec773a new backends: blur interface update 
To prepare for different blur methods, the blur interface of backends
has been splitted into two parts.

Now to use blur, a blur context must be created first; then, the blur
method should be called with the blur context created.

Updated the existing backends to the new interface. Also implemented
handling of the new blur options.

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-06-09 19:26:41 +01:00
Yuxuan Shui
1eba43f888 Rename blur kernel parameter types 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-06-09 12:57:23 +01:00
Yuxuan Shui
c1b2ce1fce Update generate_blur_kernel to use abstract parameter type 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-06-09 12:44:32 +01:00
Yuxuan Shui
e16e592302 Move enum blur_method to backend.h 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-06-09 12:43:51 +01:00
Yuxuan Shui
1da726047a new backend: don't assume center of blur kernel is 1 
Also fill the center of parsed kernel with 1. This shouldn't change the
behavior of the old backends since they will modify the center of the
kernels.

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-06-09 01:03:37 +01:00
Yuxuan Shui
f64ac97a91 Return kernel count from kernel generation functions 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-06-09 00:45:06 +01:00
Yuxuan Shui
2239181551 Properly implement gaussian blur kernel 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-06-08 23:56:47 +01:00
Yuxuan Shui
fa8faaf91d Remember the number of blur kernels 
Don't count the number of blur kernels everytime.

Fixes #188

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-06-07 22:21:06 +01:00
Yuxuan Shui
abb089e605 Lift the MAX_BLUR_PASS limit 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-06-07 07:04:50 +01:00
Yuxuan Shui
b947a45d71 backend_common: add blur kernel generation functions 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-06-06 06:56:21 +01:00
Yuxuan Shui
b9a3b67f9c new backend: xrender: fix INVER_COLOR_ALL 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-05-21 22:15:38 +01:00
Yuxuan Shui
294aae11ff Fix xrender APPLY_ALPHA 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-05-21 20:22:20 +01:00
Yuxuan Shui
3cabba6161 gl_common: don't use GL4 feature 
glGetIntegerv(GL_NUM_EXTENSIONS) is only available since GL4.

(However glGetStringi(GL_EXTENSIONS) is available since GL3)

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-05-21 20:15:35 +01:00
Yuxuan Shui
2d50d32bf7 new backend: glx: multiply color in APPLY_ALPHA 
Because we use pre-multiplied alpha.

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-05-21 20:15:35 +01:00
Yuxuan Shui
80c7b2f7ec new backend: glx: implement IMAGE_OP_APPLY_ALPHA 
Slight change to the backend_operations::fill interface.

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-05-21 20:15:35 +01:00
Yuxuan Shui
18b1fc95ff new backend: glx: reduce code duplication 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-05-21 20:15:35 +01:00
Yuxuan Shui
45ead409b5 new backend: glx: fix off-by-1 in blur shader generation 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-05-21 20:15:35 +01:00
Yuxuan Shui
86f4d73c22 new backend: gl_common: add support for decoupling lazy copied images 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-05-21 20:15:35 +01:00
Yuxuan Shui
b91888b0a3 new backend: glx: trivial refactoring 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-05-21 20:15:34 +01:00
Yuxuan Shui
939f2fb602 common.h: general clean up 
Remove unused functions and definitions. Move some macros into the files
they belong.

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-05-21 20:15:34 +01:00
Yuxuan Shui
be673f93c6 backend: add interfaces for readiness reporting 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-05-21 20:15:33 +01:00
Yuxuan Shui
468fb637b6 new backends: xrender: fix memory leak 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-05-21 20:15:32 +01:00
Yuxuan Shui
8e5210cb9c new backend: glx: use glFinish instead of glXWaitGL 
The API document claims they achieve the same thing, apparently not.

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-05-21 20:15:31 +01:00
Yuxuan Shui
c55088944a new backend: glx: use glFinish/glXWaitGL if not on NVIDIA 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-05-21 20:15:31 +01:00
Yuxuan Shui
b35bfd07d1 backend: driver: fix string out-of-bound read 
libxcb doesn't null terminate strings.

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-05-21 20:15:31 +01:00
Yuxuan Shui
685a583f84 backend: add preliminary support for driver detection 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-05-21 20:15:31 +01:00
Yuxuan Shui
a2d0d5c826 xrender: move into its own folder 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-05-21 20:15:31 +01:00
Yuxuan Shui
bd4c242015 win: split struct win 
Currently compton handles window creation event by immediately query all
the information it needs and create a window struct with that
information. However, this is prone to race conditions.

In the future, we want to react to window creation event by creating a
placeholder in the window stack, and only query window information in a
critical section where the X server is grabbed by us.

This commit split struct win into two struct, one as placeholder, the
other for holding actual window information.

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-05-21 20:15:29 +01:00
Yuxuan Shui
abeeb36bb2 x: wrap xcb_generate_id to check for errors 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-05-21 20:15:28 +01:00
Yuxuan Shui
3935e97e69 gl_common: bump GL to 3.30 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-05-21 20:15:27 +01:00
Yuxuan Shui
6e8a86d415 gl_common: use vao 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-05-21 20:15:27 +01:00
Yuxuan Shui
ffc9c32b5e gl_common: update gl_compose to core profile 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-05-21 20:15:27 +01:00
Yuxuan Shui
f08004a448 gl_common: update gl_blur to core profile 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-05-21 20:15:27 +01:00
Yuxuan Shui
599e8b6600 gl_common: update gl_fill to core profile 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-05-21 20:15:27 +01:00
Yuxuan Shui
233edbd1c3 gl_common: fix implicit conversion warnings 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-05-21 20:15:26 +01:00
Yuxuan Shui
7c2edd9d63 gl_common: remove some fixed function glEnable/Disable 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-05-21 20:15:26 +01:00
Yuxuan Shui
d64aab7d40 gl_common: add vertex shader 
Also use an attribute for the texture coordinates.

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-05-21 20:15:26 +01:00
Yuxuan Shui
0733f7540f Silence unused variable warning in release build 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-05-21 20:15:26 +01:00
Yuxuan Shui
0037b7e5fb Eliminate implicit conversions 
Use explicit conversions everywhere. Adding bounds check assertions when
necessary.

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-05-21 20:15:25 +01:00
Yuxuan Shui
a93754009c Dump damage region info in trace log 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-05-21 20:15:24 +01:00
Yuxuan Shui
1f80e547bc core: remove unnecessary win_check_fade_finished 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-05-21 20:15:24 +01:00
Yuxuan Shui
ad3ec8cada gl_common: initialize string marker logger 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-05-21 20:15:24 +01:00
Yuxuan Shui
f501d35ba9 core: re-run paint_preprocess after redirecting 
paint_preprocess calls redir_start if it decides to redirect the screen.
redir_start might change the state of the windows. For example, when the
image of the window fails to bind, redir_start sets the error flag. And
those state changes might exclude the window from being rendered. Thus,
paint_preprocess should be re-run to make sure the new states are
honoured.

Fixes a crash when window images fail to bind after redirecting.

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-05-21 20:15:23 +01:00
Yuxuan Shui
838a214749 Add several debug prints 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-03-23 14:35:22 +00:00
Yuxuan Shui
8dc250a415 win: update window's image lazily 
Use a flag to mark whether the image needs update, and only update once
per frame.

Also refactor some common code into functions, and handle image errors
properly.

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-03-23 14:35:21 +00:00
Yuxuan Shui
0a32c81d9c backend interface: improve documentation 2019-03-16 20:57:43 +00:00
Yuxuan Shui
5940a959dc new backend: handle --use-damage 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-03-16 12:12:54 +00:00
Yuxuan Shui
d39d937566 new glx: fix memory leak, and bind pixmap 
struct _glx_image_data needs to be freed even when refcount is not 0.

Also fixed a typo in glx_bind_pixmap.

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
 2019-03-10 22:48:42 +00:00