Move SceneOpenGL into a dedicated plugin
ClosedPublic
Actions

Authored by graesslin on Sep 8 2017, 8:42 PM.

Details

Reviewers

None

Group Reviewers

KWin
Plasma

Commits

R108:e0f7f58397a6: Move SceneOpenGL into a dedicated plugin
R108:8ae37c420bd3: Move SceneOpenGL into a dedicated plugin

Summary

Unfortunately a rather large change which required more refactoring than
initially expected. The main problem was that some parts needed to go
into platformsupport so that the platform plugins can link them. Due to
the rather monolithic nature of scene_opengl.h a few changes were
required:

SceneOpenGL::Texture -> SceneOpenGLTexture
SceneOpenGL::TexturePrivate -> SceneOpenGLTexturePrivate
texture based code into dedicated files
SwapProfiler code into dedicated files
SwapProfiler only used in x11 variants
Safety checks for OpenGL scene moved into the new plugin
signal declared in SceneOpenGL moved to Scene, so that we don't need

to include SceneOpenGL in composite

Test Plan

Nested OpenGL compositor works

Diff Detail

Repository

R108 KWin

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

graesslin created this revision.Sep 8 2017, 8:42 PM

Restricted Application added a project: KWin. · View Herald TranscriptSep 8 2017, 8:42 PM

Restricted Application added subscribers: kwin, plasma-devel. · View Herald Transcript

@bshah could you please try this patch on hwcomposer platform? I tried to get all required changes into it, but I currently don't have a compiler to verify.

In D7740#144077, @graesslin wrote:

@bshah could you please try this patch on hwcomposer platform? I tried to get all required changes into it, but I currently don't have a compiler to verify.

Can you commit them in one branch? makes easier for me to CI build this change, as patch is massive.

In D7740#144574, @bshah wrote:

In D7740#144077, @graesslin wrote:

@bshah could you please try this patch on hwcomposer platform? I tried to get all required changes into it, but I currently don't have a compiler to verify.

Can you commit them in one branch? makes easier for me to CI build this change, as patch is massive.

done: https://commits.kde.org/kwin/e0f7f58397a613a34312e93b53ade2c72ebc202b

In D7740#144814, @graesslin wrote:

done: https://commits.kde.org/kwin/e0f7f58397a613a34312e93b53ade2c72ebc202b

Tested this branch, and seems to build and work completely fine

In D7740#144854, @bshah wrote:

In D7740#144814, @graesslin wrote:

done: https://commits.kde.org/kwin/e0f7f58397a613a34312e93b53ade2c72ebc202b

Tested this branch, and seems to build and work completely fine

wonderful, thanks a lot!

ping

Closed by commit R108:8ae37c420bd3: Move SceneOpenGL into a dedicated plugin (authored by graesslin). · Explain WhySep 30 2017, 11:25 AM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

		Path
M		CMakeLists.txt (2 lines)
V		{ → platformsupport/scenes/opengl}/abstract_egl_backend.h
V		{ → platformsupport/scenes/opengl}/abstract_egl_backend.cpp
M		composite.cpp (45 lines)
M		data/org_kde_kwin.categories (1 line)
M		lanczosfilter.h (3 lines)
M		libkwineffects/kwingltexture_p.h (2 lines)
M		platformsupport/scenes/CMakeLists.txt (1 line)
A	M	platformsupport/scenes/opengl/CMakeLists.txt (23 lines)
V		{platformsupport/scenes/opengl ← }/abstract_egl_backend.h (20 lines)
V		{platformsupport/scenes/opengl ← }/abstract_egl_backend.cpp (28 lines)
A	M	platformsupport/scenes/opengl/backend.h (325 lines)
A	M	platformsupport/scenes/opengl/backend.cpp (119 lines)
A	M	platformsupport/scenes/opengl/swap_profiler.h (53 lines)
A	M	platformsupport/scenes/opengl/swap_profiler.cpp (57 lines)
A	M	platformsupport/scenes/opengl/texture.h (76 lines)
A	M	platformsupport/scenes/opengl/texture.cpp (80 lines)
M		plugins/platforms/drm/CMakeLists.txt (4 lines)
M		plugins/platforms/drm/egl_gbm_backend.h (5 lines)
M		plugins/platforms/drm/egl_gbm_backend.cpp (4 lines)
M		plugins/platforms/hwcomposer/CMakeLists.txt (2 lines)
M		plugins/platforms/hwcomposer/egl_hwcomposer_backend.h (4 lines)
M		plugins/platforms/hwcomposer/egl_hwcomposer_backend.cpp (4 lines)
M		plugins/platforms/virtual/CMakeLists.txt (3 lines)
M		plugins/platforms/virtual/egl_gbm_backend.h (5 lines)
M		plugins/platforms/virtual/egl_gbm_backend.cpp (5 lines)
M		plugins/platforms/virtual/virtual_backend.cpp (1 line)
M		plugins/platforms/wayland/CMakeLists.txt (3 lines)
M		plugins/platforms/wayland/egl_wayland_backend.h (5 lines)
M		plugins/platforms/wayland/egl_wayland_backend.cpp (4 lines)
M		plugins/platforms/x11/common/CMakeLists.txt (1 line)
M		plugins/platforms/x11/common/eglonxbackend.h (9 lines)
M		plugins/platforms/x11/common/eglonxbackend.cpp (8 lines)
M		plugins/platforms/x11/standalone/CMakeLists.txt (4 lines)
M		plugins/platforms/x11/standalone/glxbackend.h (14 lines)
M		plugins/platforms/x11/standalone/glxbackend.cpp (12 lines)
M		plugins/platforms/x11/windowed/CMakeLists.txt (3 lines)
M		plugins/platforms/x11/windowed/x11windowed_backend.cpp (2 lines)
M		plugins/scenes/CMakeLists.txt (1 line)
A	M	plugins/scenes/opengl/CMakeLists.txt (26 lines)
A	M	plugins/scenes/opengl/opengl.json (9 lines)
A	M	plugins/scenes/opengl/scene_opengl.h (354 lines)
V		{plugins/scenes/opengl ← }/scene_opengl.cpp (268 lines)
M		scene.h (1 line)
D	M	scene_opengl.h (694 lines)
V		{ → plugins/scenes/opengl}/scene_opengl.cpp

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	19319	db2ddec		Sep 8 2017, 8:42 PM	★	★
Diff 2	20142	343d8c9	R108:8ae37c420bd3cffae2ae86f91ae5b3f214d7af8b	Sep 30 2017, 11:12 AM	★	★

Commit	Tree	Parents	Author	Summary	Date
9ae648563ed7	473e361db320	db2ddec23d51	Martin Flöser	Move SceneOpenGL into a dedicated plugin (Show More…)	Sep 8 2017, 8:30 PM

	Status	Author	Revision
	Closed	graesslin	D7740 Move SceneOpenGL into a dedicated plugin
	Closed	graesslin	D7734 Add virtual method to Scene to get the EGL/GLX extensions

Move SceneOpenGL into a dedicated pluginClosedPublicActions

Details

Diff Detail

Revision ContentsChangeset List

Diff 20142

CMakeLists.txt

abstract_egl_backend.h

abstract_egl_backend.cpp

composite.cpp

data/org_kde_kwin.categories

lanczosfilter.h

libkwineffects/kwingltexture_p.h

platformsupport/scenes/CMakeLists.txt

platformsupport/scenes/opengl/CMakeLists.txt

platformsupport/scenes/opengl/abstract_egl_backend.h

platformsupport/scenes/opengl/abstract_egl_backend.cpp

platformsupport/scenes/opengl/backend.h

platformsupport/scenes/opengl/backend.cpp

platformsupport/scenes/opengl/swap_profiler.h

platformsupport/scenes/opengl/swap_profiler.cpp

platformsupport/scenes/opengl/texture.h

platformsupport/scenes/opengl/texture.cpp

plugins/platforms/drm/CMakeLists.txt

plugins/platforms/drm/egl_gbm_backend.h

plugins/platforms/drm/egl_gbm_backend.cpp

plugins/platforms/hwcomposer/CMakeLists.txt

plugins/platforms/hwcomposer/egl_hwcomposer_backend.h

plugins/platforms/hwcomposer/egl_hwcomposer_backend.cpp

plugins/platforms/virtual/CMakeLists.txt

plugins/platforms/virtual/egl_gbm_backend.h

plugins/platforms/virtual/egl_gbm_backend.cpp

plugins/platforms/virtual/virtual_backend.cpp

plugins/platforms/wayland/CMakeLists.txt

plugins/platforms/wayland/egl_wayland_backend.h

plugins/platforms/wayland/egl_wayland_backend.cpp

plugins/platforms/x11/common/CMakeLists.txt

plugins/platforms/x11/common/eglonxbackend.h

plugins/platforms/x11/common/eglonxbackend.cpp

plugins/platforms/x11/standalone/CMakeLists.txt

plugins/platforms/x11/standalone/glxbackend.h

plugins/platforms/x11/standalone/glxbackend.cpp

plugins/platforms/x11/windowed/CMakeLists.txt

plugins/platforms/x11/windowed/x11windowed_backend.cpp

plugins/scenes/CMakeLists.txt

plugins/scenes/opengl/CMakeLists.txt

plugins/scenes/opengl/opengl.json

plugins/scenes/opengl/scene_opengl.h

plugins/scenes/opengl/scene_opengl.cpp

scene.h

scene_opengl.h

scene_opengl.cpp

Move SceneOpenGL into a dedicated plugin
ClosedPublic
Actions

Revision Contents
Changeset List