cd28637187
Remove fmt parameter from wlr_texture_write_pixels
...
It's not allowed to change the format of a texture so remove
the confusing parameter.
2018-10-15 23:56:56 +02:00
ad406db21c
gles2: change context when it is not current
...
Texture functions, that create and manipulate textures should switch
the current context if necessary.
thanks to: @emersion
Fixes #934
2018-08-03 07:43:22 +02:00
b902c2bd7c
Revert "Move side-effect out of assert statement"
...
This reverts commit a0afedcd8f
2018-07-13 15:46:54 -04:00
a0afedcd8f
Move side-effect out of assert statement
2018-07-13 13:54:09 -04:00
c4915d1492
render: add wlr_texture_is_opaque
2018-07-12 23:35:33 +01:00
7cbef15206
util: add wlr_ prefix to log symbols
2018-07-09 22:49:54 +01:00
cc9b198f9e
render/gles2: ditch extra parens
2018-06-30 23:19:02 +01:00
bf7560b7cd
screencopy: add capture_output_region support
2018-06-30 22:18:04 +01:00
2b9cbaddf3
screencopy: add support for frame flags
2018-06-30 22:18:03 +01:00
57548b557a
Merge branch 'master' into screencontent
2018-06-17 14:49:18 +01:00
d643361c48
Merge pull request #1047 from NotKit/gles2fix
...
Fix GLES2 renderer to use glGetUniformLocations locations
2018-06-13 15:37:16 +01:00
6f29db1044
gles2 renderer: introduce struct wlr_gles2_tex_shader
2018-06-13 13:43:01 +03:00
f1a62a3200
Rename egl.exts to match the extension names
2018-06-09 19:11:51 +02:00
457bfcab19
render/egl: only request high priority context on DRM
2018-06-08 00:17:45 +01:00
de91c55ea9
Fix GLES2 renderer to use glGetUniformLocations locations
...
This is needed as uniform locations are driver implementation-specific.
2018-06-07 18:06:31 +03:00
6b7a55aa3d
Merge pull request #1020 from emersion/remove-check-dmabuf
...
render: remove wlr_renderer_check_import_dmabuf
2018-05-31 21:49:57 +01:00
21928cbe61
Merge branch 'master' into screencontent
2018-05-31 12:33:27 +01:00
d1cf9acbd5
cleanup: Use void for zero-parameter functions
...
Signed-off-by: Genki Sky <sky@genki.is>
2018-05-30 20:19:16 -04:00
135721118a
render: remove wlr_renderer_check_import_dmabuf
...
It's possible to implement it outside the renderer, by creating a
texture and destroying it right away. This reduces the API surface
of the renderer.
2018-05-30 17:08:15 +01:00
28020ff577
Only allow one modifier per DMA-BUF, split attributes struct in render/
2018-05-30 09:29:12 +01:00
5ba1a9af56
render: add wlr_texture_to_dmabuf
2018-05-29 18:47:17 +01:00
41130fe54b
render: bind wl_drm in renderer
2018-05-21 19:07:08 +01:00
47ffd0e184
gles2: pre-multiply alpha and fix blending function
2018-05-18 20:34:36 +03:00
35e83800d4
Fix alpha for src_rgba and src_rgbx
2018-05-15 22:29:36 -04:00
71ca45e2c0
Make sure we don't use others' prefixes
2018-04-25 23:24:58 +01:00
018b82c01e
render/egl: allow passing NULL to surface and image destructors
2018-04-25 08:28:48 +01:00
1b802d9251
Make wlr_renderer_scissor take normal coords instead of upside-down ones
2018-04-12 19:38:33 -04:00
d2ebbd103c
backend: remove wlr_backend_get_egl
2018-04-08 11:00:56 -04:00
f3f61bed3e
Untie wlr_gles2_renderer and wlr_gles2_texture
2018-04-01 16:07:50 -04:00
a7bb48b404
render/egl: add wlr_egl_create_image_from_wl_drm
...
This allows external renderers and potential future GL-based
renderers to re-use this function.
2018-03-31 23:20:00 -04:00
33a2eb4b77
Untie wlr_backend from wlr_renderer
2018-03-31 18:49:43 -04:00
23d357e371
Downgrade gles2 messages to L_DEBUG
...
L_INFO is for stuff that's useful to the user
2018-03-31 00:27:30 -04:00
c9ed6fed59
Fix build error with -O2
...
../render/gles2/renderer.c: In function ‘gles2_render_texture_with_matrix’:
../render/gles2/renderer.c:140:2: error: ‘target’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
glBindTexture(target, tex_id);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../render/gles2/renderer.c:145:2: error: ‘prog’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
glUseProgram(prog);
2018-03-31 01:05:33 +03:00
330ee08126
Merge pull request #744 from emersion/texture-redesign
...
Redesign wlr_texture
2018-03-28 00:14:57 -04:00
c42fd1018b
render: remove GL calls from wlr_egl
2018-03-27 17:02:48 -04:00
adf4fb08dd
Merge branch 'master' into texture-redesign
2018-03-26 19:13:13 -04:00
793c3b3047
render: add simple functions to render rectangles and ellipses
2018-03-26 12:41:51 -04:00
c63d94483b
Redesign wlr_texture
...
- Textures are now immutable (apart from those created from raw
pixels), no more invalid textures
- Move all wl_drm stuff in wlr_renderer
- Most of wlr_texture fields are now private
- Remove some duplicated DMA-BUF code in the DRM backend
- Add more assertions
- Stride is now always given as bytes rather than pixels
- Drop wl_shm functions
Fun fact: this patch has been written 10,000 meters up in the air.
2018-03-24 23:48:32 -04:00
b1852096c5
linux-dmabuf: Support multi plane formats like NV12
2018-03-23 09:03:31 +01:00
a854c2f246
Merge branch 'master' into gles2-renderer-redesign
2018-03-23 00:55:55 +01:00
b1f93bc5cc
render/egl: use EGL_KHR_debug
2018-03-21 10:42:43 +01:00
8207f0f081
render/gles2: use gles2_pixel_format::has_alpha for shader selection
2018-03-21 08:53:36 +01:00
cc5ef1d2ff
render/gles2: move list of supported WL formats to pixel_format.c
2018-03-21 08:50:59 +01:00
3581573bdc
render/gles2: make wlr_renderer_begin take viewport size
...
This allows raw GL calls outside wlr_renderer to be removed.
2018-03-21 07:37:09 +01:00
95e86e675a
render/gles2: remove global state, use OpenGL debug extension
2018-03-20 19:14:33 +01:00
2d01663b25
gles2: Honor alpha in fragment_src_external
...
By using the same vertex shader and adding alpha to the fragment shader
for external textures we can:
- use alpha blending
- have wlr_gles2_render_texture_with_matrix work with
the GL_TEXTURE_EXTERNAL_OES. So far this failed
since we passed in alpha which was unknown by fragment_src_external
2018-03-20 14:30:30 +01:00
13e4ba4867
gles2_texture_bind: use texture's target type
...
Hardcoding GL_TEXTURE_2D leads to rendering errors when using
GL_TEXTURE_EXTERNAL_OES textures.
2018-03-20 14:30:30 +01:00
b3cb5a36c7
gles2: allow to specify texture target type
...
Allow to set the texture target type when generating/binding the
texture. This allows us to attach the texture type to the texture so we
don't have to keep the logic elsewhere.
2018-03-20 14:30:30 +01:00
c41de2d1be
render: split render.h into wlr_renderer.h and wlr_texture.h
2018-03-19 23:16:29 +01:00
6ecb0eefcb
render/gles2: transpose matrices before binding them
...
Setting glUniformMatrix3fv's transpose parameter to GL_TRUE is
not allowed for OpenGL ES 2.
This adds a wlr_matrix_transpose function.
2018-03-19 20:21:02 +01:00
1956d3cedb
Merge pull request #722 from emersion/matrix-redesign
...
Matrix redesign
2018-03-17 15:22:00 -04:00
f1cbbac636
render/gles2: remove matrix transposition in shaders
2018-03-15 21:30:31 +01:00
876f07e9f1
renderer: replace wlr_texture_get_matrix by wlr_render_texture
2018-03-15 19:31:02 +01:00
0e253e0615
render/gles2: don't set inverted_y when EGL_WAYLAND_Y_INVERTED_WL is unsupported
2018-03-15 15:51:15 +01:00
8b58e1a3ad
Merge branch 'master' into matrix-redesign
2018-03-15 15:48:09 +01:00
824a95ad19
matrix: use 2D matrices
2018-03-15 15:33:58 +01:00
653bc282a7
Indent GLSL by two spaces
...
since this is the most established indentation
2018-03-15 12:40:18 +01:00
14cdb6153f
Add initial linux_dmabuf protocol support
...
Tested with
./weston-simple-dmabuf-drm
./weston-simple-dmabuf-drm --import-immediate=1
./weston-simple-dmabuf-drm --y-inverted=1
(and combinations)
Supports only single plane XRGB dmabufs for now.
2018-03-15 12:40:18 +01:00
d26b67cb06
matrix: unify API, don't use array pointers
2018-03-15 11:10:56 +01:00
b6a3f240c7
matrix: move to types/
2018-03-15 09:11:27 +01:00
2d0db16942
render: Flip textures in case of inverted_y
2018-03-11 19:02:05 +01:00
2dc8a35db2
textures: tell us which texture format is unsupported
2018-02-28 18:36:32 +01:00
d08792bfff
Add alpha to wlr_render_with_matrix
...
so we can use the alpha channel to e.g. blend in textures
2018-02-25 13:47:48 +01:00
1d9be89e2d
Revert "ELF Visibility"
2018-02-19 18:01:27 -05:00
86269052eb
Explicitly export EFL symbols
2018-02-19 14:26:40 +13:00
c2e1474010
Reformat all #include directives
2018-02-12 21:29:23 +01:00
36ead80cd1
Make wlr_signal_emit_safe private
2018-02-12 19:52:47 +01:00
5e58d46cc1
Add wlr_signal_emit_safe
2018-02-12 09:12:31 +01:00
ddb1779f9f
render: make wlr_renderer_clear take a float[4] for the color
2018-02-03 09:32:02 +01:00
51c22d39a4
Merge remote-tracking branch 'upstream/master' into output-damage
2018-01-29 23:24:09 +01:00
ed5b1fdedd
Merge pull request #580 from emersion/screenshooter-renderer-backport
...
Backport screenshooter fixes from the renderer redesign v1
2018-01-29 17:13:23 -05:00
f34a1b75eb
render/gles2: use format bpp when reading pixels
2018-01-26 23:13:41 +01:00
6281deb90f
Merge remote-tracking branch 'upstream/master' into output-damage
2018-01-24 14:48:01 +01:00
4fa90b0511
Backport screenshooter fixes from the renderer redesign v1
...
This backports some changes to #319 to fix the screenshooter data
format. This also adds wlr_backend_get_renderer which will be
useful to support multiple renderers.
2018-01-23 22:06:54 +01:00
415a2b7c56
render: add wlr_renderer_clear and wlr_renderer_scissor
2018-01-22 16:42:22 +01:00
a0f24b809e
output: add damage event
2018-01-19 13:13:46 +01:00
5017d7f762
rootston: only draw damaged regions
2018-01-18 14:36:42 +01:00
3751a17321
decorate xwayland views
2018-01-16 07:51:10 -05:00
bc113c16aa
Use correct include path for glapi.h
2017-11-30 10:32:55 +13:00
37b8a096a9
Pass backend to render
2017-10-22 10:39:23 +13:00
9b984253e2
Move egl.h to render/egl.h
2017-10-22 10:36:07 +13:00
9e1ff2dce9
Merge pull request #140 from emersion/screenshooter
...
Add screenshooter
2017-10-08 10:06:41 -04:00
c0e5feea37
Add GL/EGL extension loader generator
2017-10-08 13:23:41 +13:00
0ce3135304
Move read_pixels from output to renderer
2017-10-08 02:11:56 +02:00
c5df6ca900
Fix memory leaks
2017-10-05 20:01:56 +00:00
009c3747a8
Multi-GPU DRM
2017-10-01 22:29:25 +13:00
220a6e9bf6
Add xwayland activate and fix EGL bug
2017-09-28 09:11:16 -04:00
f24b3df980
wlr renderer/texture: rename init to create when it does alloc
2017-08-19 08:33:31 +02:00
27c13d621d
Merge pull request #88 from 4e554c4c/alloc_crashing
...
Prevent alloc errors from crashing
2017-08-15 12:21:58 -04:00
4f2b1cc930
implement get_buffer_size for egl buffers
2017-08-15 07:58:07 -04:00
72a33b736f
implement texture get buffer size
2017-08-15 07:36:50 -04:00
5cc7342606
Prevent alloc errors from crashing
...
Resolves #76
2017-08-15 08:04:57 +02:00
f998bb8299
Fix style issues
2017-08-14 17:09:56 +02:00
4bbf718e7d
impl->destroy cleanup:
...
- remove trivial destroy() function
- make sure we check impl and impl->destroy before calling
- always call free if not implemented
2017-08-14 16:22:31 +02:00
2facf1df65
Fix software cursors
2017-08-14 08:43:17 -04:00
de6f32c84e
Refactor away wlr_renderer_state
2017-08-14 08:37:50 -04:00
94e6e6334b
Refactor out wlr_texture_state
2017-08-14 08:25:26 -04:00
f066ff6d02
Fix external shader
2017-08-12 14:48:24 +02:00
2d6d2bcef9
Merge pull request #75 from nyorain/egl_image_leak
...
Fix egl image leak in gles renderer
2017-08-12 08:22:04 -04:00
862bc9783f
Fix egl image leak in gles renderer
2017-08-12 11:41:40 +02:00
c323bfc6a0
GLES2: detach and delete shaders after LinkProgram
...
Also make sure program linked correctly!
2017-08-12 00:24:30 +02:00
a6efb90382
s/gen/ensure/ fixes #47
2017-08-11 09:00:26 -04:00
c24351681f
Refactor EGL handling
2017-08-10 22:15:37 -04:00
7095274a9e
Merge branch 'master' into drm_buffer
2017-08-10 13:19:39 -04:00
3c12a32d1f
Merge pull request #58 from acrisci/feature/enable-gl-blending
...
enable gl blending
2017-08-10 08:41:11 -04:00
49e97857c7
enable gl blending
...
This makes transparency work correctly.
fixes #56
2017-08-10 08:38:55 -04:00
888986b038
Remove excess logging
2017-08-10 08:36:45 -04:00
7da43ff8b0
Implement wlr_surface_flush_damage
2017-08-10 08:26:16 -04:00
073dff63da
Fix style issues
2017-08-10 11:05:18 +02:00
67369173aa
Implement drm (egl) buffer attaching
2017-08-10 10:59:58 +02:00
e2b7712302
Use texture->pixel_format instead of re-scanning
2017-08-09 22:56:57 -04:00
4de930542f
Implement partial texture uploads
2017-08-09 22:17:40 -04:00
e167f41fde
Rename wlr_surface -> wlr_texture; attach -> upload
2017-08-08 18:25:16 +02:00
41b98f21e5
Merge pull request #42 from acrisci/bug/no-switch-active-textures
...
Remove unnecessary calls to glActiveTexture
2017-08-05 18:26:43 -04:00
fdab81e1c9
Use meson build system
2017-08-05 22:34:24 +02:00
9119be1dd1
Remove unnecessary calls to glActiveTexture
...
Since wlroots shaders only use one texture at a time (ie there is only one
sampler2D variable in any shader), it is unnecessary to switch between active
texture units at this time.
2017-08-05 10:41:05 -04:00
effea557bb
Implement destroying surfaces
...
Add a signal for wlr_surface destruction on the wlr_surface that compositors
can listen to to remove the surface from their state.
Implement a listener for this in the example wl_compositor to remove the
surface from its internal list of surfaces.
Destroy the surface in the compositor destroy_surface callback given when the
surface resource was created.
Add a reference to the surface resource to the wlr_surface so a compositor can
find it in its list of resources upon wlr_resource destruction.
2017-08-04 11:53:55 -04:00
6610aa7ca7
Implement shm buffer surface attach interface
...
Implement surface_attach method. This is called when a client attaches an shm
buffer with wl_surface_attach().
Implement the GLES2 interface for attaching shm buffers. This creates an opengl
texture with the shm buffer contents for the surface.
This commit also includes some working code to render the surfaces onto the
screen for demonstration purposes.
2017-08-04 11:41:13 -04:00
8920b5d607
Merge branch 'wlcore'
2017-06-29 16:00:24 -04:00
0cd94f0cf0
Added software cursor fallback
2017-06-26 17:34:15 +12:00
5a2796266f
Support wl_shm pixel formats in gles2 renderer
2017-06-23 14:25:55 -04:00
2aafb5dd19
Add wlcore/wl_shm (WIP)
2017-06-23 13:41:07 -04:00
f252c5a792
Manually transpose matricies in shader
...
Since GLES2 doesn't do this for us, it seems, on all platforms.
2017-06-23 11:46:09 -04:00
b18209c904
Switch to GLES2
...
Closes #13
2017-06-23 11:38:45 -04:00
nyorain
Mariusz Bialonczyk
Drew DeVault
emersion
NeKit
Vincent Vanlaer
Genki Sky
Ilia Bozhinov
Brian Ashworth
Orestis Floros
Tony Crisci
Guido Günther
Scott Anderson
Versus Void
Dominique Martinet
Calvin Lee