<html>
<body>
<div style="font-family: Verdana, Arial, Helvetica, Sans-Serif;">
<table bgcolor="#f9f3c9" width="100%" cellpadding="8" style="border: 1px #c9c399 solid;">
<tr>
<td>
This is an automatically generated e-mail. To reply, visit:
<a href="https://git.reviewboard.kde.org/r/115934/">https://git.reviewboard.kde.org/r/115934/</a>
</td>
</tr>
</table>
<br />
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">This review has been submitted with commit 74fb8160995e9310d465244a2db369851f4ea2d7 by Martin Gräßlin to branch master.</pre>
<br />
<p>- Commit Hook</p>
<br />
<p>On February 26th, 2014, 6:39 a.m. UTC, Martin Gräßlin wrote:</p>
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="8" style="background-image: url('https://git.reviewboard.kde.org/static/rb/images/review_request_box_top_bg.ab6f3b1072c9.png'); background-position: left top; background-repeat: repeat-x; border: 1px black solid;">
<tr>
<td>
<div>Review request for Plasma and David Stephen Hubner.</div>
<div>By Martin Gräßlin.</div>
<p style="color: grey;"><i>Updated Feb. 26, 2014, 6:39 a.m.</i></p>
<div style="margin-top: 1.5em;">
<b style="color: #575012; font-size: 10pt;">Repository: </b>
kde-workspace
</div>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Description </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: 1px solid #b8b5a0">
<tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">[kinfocenter] Make GLX and EGL not mutual exclusive
GLX and EGL can both be used at the same time. What cannot be used
is OpenGL and OpenGLES at the same time. In the complete detection
code there is only one GLES specific include and one function call.
Everything else is just EGL specific. Thus it is nice to get the
information about GLX and EGL at the same time.
The compile time switches are reworked to have a KCM_HAVE_GLX which
is defined to 1 in case that we build for OpenGL (GLX is no-no if
we build for OpenGLES) and a KCM_HAVE_EGL if EGL library is found.
This can be used in both cases.
All the code which used to be ifdefed for OpenGL specific becomes
ifdefed for GLX specific and all the code specific for OpenGLES
becomes EGL specific with the exception of the eglBindAPI which
still needs to be in the GLES ifdef.
The detection code is split into two methods: one for GLX and one
for EGL and both are run depending on which defines are set.
As a slight unrelated change the name "OpenGL/ES" is split via
ifdefs in "OpenGL" and "OpenGL ES". The cases are clearly different
and that should be reflected in the UI and not mixed together.
[kinfocenter] Do not tie OpenGL config to KWin
Depend on how Qt is configured, not how KWin is configured. KWin
doesn't matter anymore as it uses the Qt configuration itself.</pre>
</td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Testing </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: 1px solid #b8b5a0">
<tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">Only tested with my Mesa powered system. Would be nice if someone with a proprietary driver could also test this.</pre>
</td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Diffs</b> </h1>
<ul style="margin-left: 3em; padding-left: 0;">
<li>kinfocenter/Modules/CMakeLists.txt <span style="color: grey">(e885835f2f75b791d36ecc4c5a411c120fdda117)</span></li>
<li>kinfocenter/Modules/opengl/CMakeLists.txt <span style="color: grey">(d049094fe0e798ea7ff128dbaf93c0ebc0bdba72)</span></li>
<li>kinfocenter/Modules/opengl/opengl.cpp <span style="color: grey">(601337f071452eca7a3add127e8e1ff1586bbef0)</span></li>
<li>kinfocenter/Modules/opengl/openglconfig.h.cmake <span style="color: grey">(bd8f4716e1d653a143b12040d89979639f112d6f)</span></li>
</ul>
<p><a href="https://git.reviewboard.kde.org/r/115934/diff/" style="margin-left: 3em;">View Diff</a></p>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">File Attachments </h1>
<ul>
<li><a href="https://git.reviewboard.kde.org/media/uploaded/files/2014/02/21/12d45359-157a-4a18-a2d5-7e3c33a60fe7__kinfocenter-egl-glx.png">KInfocenter with both EGL and GLX</a></li>
</ul>
</td>
</tr>
</table>
</div>
</body>
</html>