Re: [Mesa-dev] [PATCH] glx: Fix compilation with GLX_USE_WINDOWSGL
On 14/12/2018 19:22, Jon Turney wrote:
On 14/12/2018 15:15, Emil Velikov wrote:
On Fri, 14 Dec 2018 at 14:56, Jon Turney
wrote:
Sadly, the GLX_USE_APPLEGL and GLX_USE_WINDOWSGL cases are not identical
(because GLX_USE_WINDOWSGL uses vtables rather than a maze of ifdefs)
Include again, as functions prototyped by it are used in
the GLX_USE_WINDOWSGL path.
Make the include guard around the __glxGetMscRate() definition match the
one at it's declaration again, as it's referenced from dri_common.c
which is built for GLX_USE_WINDOWSGL.
Cc: Emil Velikov
Fixes: a95ec138 ("glx: mandate xf86vidmode only for "drm" dri
platforms")
Signed-off-by: Jon Turney
Reviewed-by: Emil Velikov
Jon, when you have some time, can you please write a Travis config for
Cygwin.
This way we can do some basic checks a bit easier.
Yeah, that would be a good idea.
I've posted an updated version of my patchset to add a cygwin build for
appveyor.
I've now pushed this.
Doing this on travis will be challenging, especially to run the tests.
If/when we move to gitlab CI we can simply copy it over ;-)
(It is apparently now possible to use appveyor as a CI provider for a
self-hosted gitlab instance (see [1]), but I've no idea how to set that up)
[1] https://github.com/appveyor/ci/issues/711
This turns out to be straightforward, if you want to set this up on a
personal gitlab repo:
1. Log into gitlab web interface
2. Settings/Access Tokens. Create a token for appveyor to use.
3. Log into appveyor web interface
4. '+ New project', choose 'GitLab EE'. Provide base URL
'https://gitlab.freedesktop.org' and the access token from above. Choose
mesa from the list of projects.
5. Done
This installs suitable webhooks in giblab to notify appveyor of pushes
and MRs, and appveyor uses the gitlab commit status API to report the
result, which appears as an 'external' pipeline in gitlab.
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] glx: Fix compilation with GLX_USE_WINDOWSGL
On 14/12/2018 15:15, Emil Velikov wrote:
On Fri, 14 Dec 2018 at 14:56, Jon Turney wrote:
Sadly, the GLX_USE_APPLEGL and GLX_USE_WINDOWSGL cases are not identical
(because GLX_USE_WINDOWSGL uses vtables rather than a maze of ifdefs)
Include again, as functions prototyped by it are used in
the GLX_USE_WINDOWSGL path.
Make the include guard around the __glxGetMscRate() definition match the
one at it's declaration again, as it's referenced from dri_common.c
which is built for GLX_USE_WINDOWSGL.
Cc: Emil Velikov
Fixes: a95ec138 ("glx: mandate xf86vidmode only for "drm" dri platforms")
Signed-off-by: Jon Turney
Reviewed-by: Emil Velikov
Jon, when you have some time, can you please write a Travis config for Cygwin.
This way we can do some basic checks a bit easier.
Yeah, that would be a good idea.
I've posted an updated version of my patchset to add a cygwin build for
appveyor.
Doing this on travis will be challenging, especially to run the tests.
If/when we move to gitlab CI we can simply copy it over ;-)
(It is apparently now possible to use appveyor as a CI provider for a
self-hosted gitlab instance (see [1]), but I've no idea how to set that up)
[1] https://github.com/appveyor/ci/issues/711
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] glx: Fix compilation with GLX_USE_WINDOWSGL
On Fri, 14 Dec 2018 at 14:56, Jon Turney wrote:
>
> Sadly, the GLX_USE_APPLEGL and GLX_USE_WINDOWSGL cases are not identical
> (because GLX_USE_WINDOWSGL uses vtables rather than a maze of ifdefs)
>
> Include again, as functions prototyped by it are used in
> the GLX_USE_WINDOWSGL path.
>
> Make the include guard around the __glxGetMscRate() definition match the
> one at it's declaration again, as it's referenced from dri_common.c
> which is built for GLX_USE_WINDOWSGL.
>
> Cc: Emil Velikov
> Fixes: a95ec138 ("glx: mandate xf86vidmode only for "drm" dri platforms")
> Signed-off-by: Jon Turney
Reviewed-by: Emil Velikov
Jon, when you have some time, can you please write a Travis config for Cygwin.
This way we can do some basic checks a bit easier.
If/when we move to gitlab CI we can simply copy it over ;-)
Thanks
Emil
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH] glx: Fix compilation with GLX_USE_WINDOWSGL
Sadly, the GLX_USE_APPLEGL and GLX_USE_WINDOWSGL cases are not identical
(because GLX_USE_WINDOWSGL uses vtables rather than a maze of ifdefs)
Include again, as functions prototyped by it are used in
the GLX_USE_WINDOWSGL path.
Make the include guard around the __glxGetMscRate() definition match the
one at it's declaration again, as it's referenced from dri_common.c
which is built for GLX_USE_WINDOWSGL.
Cc: Emil Velikov
Fixes: a95ec138 ("glx: mandate xf86vidmode only for "drm" dri platforms")
Signed-off-by: Jon Turney
---
src/glx/glxcmds.c | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/glx/glxcmds.c b/src/glx/glxcmds.c
index d00c0d4816d..bde461b43a3 100644
--- a/src/glx/glxcmds.c
+++ b/src/glx/glxcmds.c
@@ -45,8 +45,8 @@
#include "apple/apple_glx.h"
#include "util/debug.h"
#else
-#ifndef GLX_USE_WINDOWSGL
#include
+#ifndef GLX_USE_WINDOWSGL
#include
#endif /* GLX_USE_WINDOWSGL */
#endif
@@ -2083,11 +2083,12 @@ __glXGetSyncValuesOML(Display * dpy, GLXDrawable
drawable,
return False;
}
-#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL) &&
!defined(GLX_USE_WINDOWSGL)
+#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)
_X_HIDDEN GLboolean
__glxGetMscRate(struct glx_screen *psc,
int32_t * numerator, int32_t * denominator)
{
+#if !defined(GLX_USE_WINDOWSGL)
XF86VidModeModeLine mode_line;
int dot_clock;
int i;
@@ -2134,6 +2135,7 @@ __glxGetMscRate(struct glx_screen *psc,
return True;
}
+#endif
return False;
}
--
2.17.0
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
