Bug 105431 - [EFL] [WebGL] [WK2] Replace HAVE(GLX) checks with USE(GLX)
Summary: [EFL] [WebGL] [WK2] Replace HAVE(GLX) checks with USE(GLX)
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: WebKit EFL (show other bugs)
Version: 528+ (Nightly build)
Hardware: PC Linux
: P2 Normal
Assignee: Kalyan
URL:
Keywords:
Depends on:
Blocks: 105286
  Show dependency treegraph
 
Reported: 2012-12-19 06:28 PST by Kalyan
Modified: 2012-12-20 15:58 PST (History)
9 users (show)

See Also:


Attachments
patch (15.92 KB, patch)
2012-12-19 12:28 PST, Kalyan
laszlo.gombos: review-
Details | Formatted Diff | Diff
patchv2 (15.79 KB, patch)
2012-12-19 14:56 PST, Kalyan
no flags Details | Formatted Diff | Diff
patch (14.46 KB, patch)
2012-12-20 12:38 PST, Kalyan
no flags Details | Formatted Diff | Diff
patch (14.50 KB, patch)
2012-12-20 12:49 PST, Kalyan
no flags Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Kalyan 2012-12-19 06:28:23 PST
In our side, we check if GLX is supported or not. We should change this check to USE, to be able to configure  using EGL or GLX
Comment 1 Kalyan 2012-12-19 12:28:12 PST
Created attachment 180208 [details]
patch
Comment 2 Laszlo Gombos 2012-12-19 14:10:27 PST
Comment on attachment 180208 [details]
patch

View in context: https://bugs.webkit.org/attachment.cgi?id=180208&action=review

I think renaming from HAVE() to USE() make sense. I only reviewed the EFL-only parts (OptionsEfl.cmake) to make the next round of review easier.

r- to fix the EFL CMake file and make it consistent with the intention of the patch.

> Source/cmake/OptionsEfl.cmake:170
>          add_definitions(-DHAVE_GLX)

I think this can be removed now.

> Source/cmake/OptionsEfl.cmake:171
> +        set(WTF_USE_GLX 1)

This is not needed - WTF_USE_GLX variable is not used anywhere in the make system so no need to set it.

> Source/cmake/OptionsEfl.cmake:172
> +        add_definitions(-DWTF_USE_GLX=1)

This is correct, this is the only definition that actually needed.

> Source/cmake/OptionsEfl.cmake:174
> +        set(ENABLE_GLX 1)
> +        add_definitions(-DENABLE_GLX=1)

Not needed, not used anywhere.
Comment 3 Kalyan 2012-12-19 14:56:19 PST
Created attachment 180231 [details]
patchv2

review fixes
Comment 4 Kalyan 2012-12-19 14:58:28 PST
(In reply to comment #2)
> (From update of attachment 180208 [details])
> View in context: https://bugs.webkit.org/attachment.cgi?id=180208&action=review
> 
> > Source/cmake/OptionsEfl.cmake:174
> > +        set(ENABLE_GLX 1)
> > +        add_definitions(-DENABLE_GLX=1)
> 
> Not needed, not used anywhere.

Done.
Comment 5 Kenneth Rohde Christiansen 2012-12-20 08:26:46 PST
Comment on attachment 180231 [details]
patchv2

View in context: https://bugs.webkit.org/attachment.cgi?id=180231&action=review

This looks like something which should be two patches

> ChangeLog:8
> +        This patch changes the check Have(GLX) to Use(GLX).

HAVE, USE!

> Source/WebCore/platform/graphics/opengl/GLDefs.h:58
> -#if HAVE(GLX)
> +typedef uint32_t PlatformBufferHandle;
> +
> +#if USE(GLX)
>  typedef GLXContext PlatformContext;
>  typedef Display* PlatformDisplay;
>  typedef GLXFBConfig PlatformSurfaceConfig;
> -typedef GLXDrawable PlatformSurface;
> +typedef GLXDrawable PlatformDrawable;
>  #else
>  typedef void* PlatformContext;
>  typedef void* PlatformDisplay;
>  typedef void* PlatformSurfaceConfig;
> -typedef void* PlatformSurface;
> +typedef void* PlatformDrawable;

why is this change not explained?
Comment 6 Kalyan 2012-12-20 12:38:06 PST
Created attachment 180388 [details]
patch
Comment 7 Kalyan 2012-12-20 12:39:17 PST
Comment on attachment 180388 [details]
patch

K, Misunderstood the first comment. Will update a new patch
Comment 8 Kalyan 2012-12-20 12:49:52 PST
Created attachment 180390 [details]
patch
Comment 9 Kalyan 2012-12-20 12:50:44 PST
(In reply to comment #5)
> (From update of attachment 180231 [details])
> View in context: https://bugs.webkit.org/attachment.cgi?id=180231&action=review

> HAVE, USE!

done

> > Source/WebCore/platform/graphics/opengl/GLDefs.h:58
> 
> why is this change not explained?

Added comments in changelog file
Comment 10 Kenneth Rohde Christiansen 2012-12-20 13:10:00 PST
Comment on attachment 180390 [details]
patch

in the future things like this should be two patches.
Comment 11 WebKit Review Bot 2012-12-20 13:55:22 PST
Comment on attachment 180390 [details]
patch

Rejecting attachment 180390 [details] from commit-queue.

New failing tests:
inspector-protocol/debugger-terminate-dedicated-worker-while-paused.html
Full output: http://queues.webkit.org/results/15452137
Comment 12 Viatcheslav Ostapenko 2012-12-20 15:53:13 PST
Comment on attachment 180390 [details]
patch

Re-submitting patch to the queue because the failing inspector test is unrelated, probably flaky.
Comment 13 WebKit Review Bot 2012-12-20 15:58:08 PST
Comment on attachment 180390 [details]
patch

Clearing flags on attachment: 180390

Committed r138313: <http://trac.webkit.org/changeset/138313>
Comment 14 WebKit Review Bot 2012-12-20 15:58:14 PST
All reviewed patches have been landed.  Closing bug.