Re: [Piglit] [PATCH 1/4] framework: Use WGL by default on Windows.
On Monday, December 15, 2014 07:12:45 PM Jose Fonseca wrote: > On 15/12/14 17:24, Dylan Baker wrote: > > On Monday, December 15, 2014 12:19:15 PM Jose Fonseca wrote: > >> From: José Fonseca > >> > >> Like done with GLX on Linux. > >> --- > >> tests/util/piglit-framework-gl/piglit_wfl_framework.c | 4 +++- > >> 1 file changed, 3 insertions(+), 1 deletion(-) > >> > >> diff --git a/tests/util/piglit-framework-gl/piglit_wfl_framework.c > >> b/tests/util/piglit-framework-gl/piglit_wfl_framework.c > >> index 75fbacf..5d0f569 100644 > >> --- a/tests/util/piglit-framework-gl/piglit_wfl_framework.c > >> +++ b/tests/util/piglit-framework-gl/piglit_wfl_framework.c > >> @@ -60,8 +60,10 @@ piglit_wfl_framework_choose_platform(const struct > >> piglit_gl_test_config *test_co > >>return WAFFLE_PLATFORM_X11_EGL; > >>} > >> #endif > >> -#ifdef PIGLIT_HAS_GLX > >> +#if defined(PIGLIT_HAS_GLX) > >>return WAFFLE_PLATFORM_GLX; > >> +#elif defined(PIGLIT_HAS_WGL) > >> + return WAFFLE_PLATFORM_WGL; > >> #else > >>fprintf(stderr, "environment var PIGLIT_PLATFORM must be set " > >>"when piglit is built without GLX support\n"); > > > > You should probably update the comment here as well. Either way then. > > Sure. Though the odds of this error is ever seen on Windows is > virtually nil (as on Windows Waffle supports nothing but WGL). That is, > most readers of this message will be people building piglit on Unices > without X. > > Jose > signature.asc Description: This is a digitally signed message part. ___ Piglit mailing list Piglit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/piglit
Re: [Piglit] [PATCH 1/4] framework: Use WGL by default on Windows.
On 15/12/14 17:24, Dylan Baker wrote: On Monday, December 15, 2014 12:19:15 PM Jose Fonseca wrote: From: José Fonseca Like done with GLX on Linux. --- tests/util/piglit-framework-gl/piglit_wfl_framework.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/util/piglit-framework-gl/piglit_wfl_framework.c b/tests/util/piglit-framework-gl/piglit_wfl_framework.c index 75fbacf..5d0f569 100644 --- a/tests/util/piglit-framework-gl/piglit_wfl_framework.c +++ b/tests/util/piglit-framework-gl/piglit_wfl_framework.c @@ -60,8 +60,10 @@ piglit_wfl_framework_choose_platform(const struct piglit_gl_test_config *test_co return WAFFLE_PLATFORM_X11_EGL; } #endif -#ifdef PIGLIT_HAS_GLX +#if defined(PIGLIT_HAS_GLX) return WAFFLE_PLATFORM_GLX; +#elif defined(PIGLIT_HAS_WGL) + return WAFFLE_PLATFORM_WGL; #else fprintf(stderr, "environment var PIGLIT_PLATFORM must be set " "when piglit is built without GLX support\n"); You should probably update the comment here as well. Sure. Though the odds of this error is ever seen on Windows is virtually nil (as on Windows Waffle supports nothing but WGL). That is, most readers of this message will be people building piglit on Unices without X. Jose ___ Piglit mailing list Piglit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/piglit
Re: [Piglit] [PATCH 1/4] framework: Use WGL by default on Windows.
On 15/12/14 12:19, Jose Fonseca wrote: > From: José Fonseca > > Like done with GLX on Linux. Yes please. With or without pimping out the error message, this is Reviewed-by: Emil Velikov ___ Piglit mailing list Piglit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/piglit
Re: [Piglit] [PATCH 1/4] framework: Use WGL by default on Windows.
On Monday, December 15, 2014 12:19:15 PM Jose Fonseca wrote: > From: José Fonseca > > Like done with GLX on Linux. > --- > tests/util/piglit-framework-gl/piglit_wfl_framework.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/tests/util/piglit-framework-gl/piglit_wfl_framework.c > b/tests/util/piglit-framework-gl/piglit_wfl_framework.c > index 75fbacf..5d0f569 100644 > --- a/tests/util/piglit-framework-gl/piglit_wfl_framework.c > +++ b/tests/util/piglit-framework-gl/piglit_wfl_framework.c > @@ -60,8 +60,10 @@ piglit_wfl_framework_choose_platform(const struct > piglit_gl_test_config *test_co > return WAFFLE_PLATFORM_X11_EGL; > } > #endif > -#ifdef PIGLIT_HAS_GLX > +#if defined(PIGLIT_HAS_GLX) > return WAFFLE_PLATFORM_GLX; > +#elif defined(PIGLIT_HAS_WGL) > + return WAFFLE_PLATFORM_WGL; > #else > fprintf(stderr, "environment var PIGLIT_PLATFORM must be set " > "when piglit is built without GLX support\n"); You should probably update the comment here as well. > -- > 2.1.0 > > ___ > Piglit mailing list > Piglit@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/piglit > signature.asc Description: This is a digitally signed message part. ___ Piglit mailing list Piglit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/piglit
Re: [Piglit] [PATCH 1/4] framework: Use WGL by default on Windows.
On 12/15/2014 05:19 AM, Jose Fonseca wrote: From: José Fonseca Like done with GLX on Linux. --- tests/util/piglit-framework-gl/piglit_wfl_framework.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/util/piglit-framework-gl/piglit_wfl_framework.c b/tests/util/piglit-framework-gl/piglit_wfl_framework.c index 75fbacf..5d0f569 100644 --- a/tests/util/piglit-framework-gl/piglit_wfl_framework.c +++ b/tests/util/piglit-framework-gl/piglit_wfl_framework.c @@ -60,8 +60,10 @@ piglit_wfl_framework_choose_platform(const struct piglit_gl_test_config *test_co return WAFFLE_PLATFORM_X11_EGL; } #endif -#ifdef PIGLIT_HAS_GLX +#if defined(PIGLIT_HAS_GLX) return WAFFLE_PLATFORM_GLX; +#elif defined(PIGLIT_HAS_WGL) + return WAFFLE_PLATFORM_WGL; #else fprintf(stderr, "environment var PIGLIT_PLATFORM must be set " "when piglit is built without GLX support\n"); These changes look OK to me, though I don't have too much experience in this area. Reviewed-by: Brian Paul ___ Piglit mailing list Piglit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/piglit
[Piglit] [PATCH 1/4] framework: Use WGL by default on Windows.
From: José Fonseca Like done with GLX on Linux. --- tests/util/piglit-framework-gl/piglit_wfl_framework.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/util/piglit-framework-gl/piglit_wfl_framework.c b/tests/util/piglit-framework-gl/piglit_wfl_framework.c index 75fbacf..5d0f569 100644 --- a/tests/util/piglit-framework-gl/piglit_wfl_framework.c +++ b/tests/util/piglit-framework-gl/piglit_wfl_framework.c @@ -60,8 +60,10 @@ piglit_wfl_framework_choose_platform(const struct piglit_gl_test_config *test_co return WAFFLE_PLATFORM_X11_EGL; } #endif -#ifdef PIGLIT_HAS_GLX +#if defined(PIGLIT_HAS_GLX) return WAFFLE_PLATFORM_GLX; +#elif defined(PIGLIT_HAS_WGL) + return WAFFLE_PLATFORM_WGL; #else fprintf(stderr, "environment var PIGLIT_PLATFORM must be set " "when piglit is built without GLX support\n"); -- 2.1.0 ___ Piglit mailing list Piglit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/piglit
