wayland: Fix GL extension binding init to work again for use_wayland

wayland: Fix GL extension binding init to work again for use_wayland

BUG=102903
TEST=compile

Change-Id: I39b360c5f982e83a1fad3f68f65cc3e88c31cf2a

R=backer@chromium.org,dnicoara@chromium.org,joth@chromium.org,alokp@chromium.org


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=111013

[joth, 2011-11-18 09:30:33]

I don't think this was intended for me, so I removed myself from the
reviewer list.


On 18 November 2011 05:05, <msb@chromium.org> wrote:

> Reviewers: jonathan.backer, dnicoara, joth, Alok Priyadarshi,
>
> Description:
> wayland: Fix GL extension binding init to work again for use_wayland
>
> BUG=102903
> TEST=compile
>
> Change-Id: I39b360c5f982e83a1fad3f68f65cc**3e88c31cf2a
>
> R=backer@chromium.org,dnicoara**@chromium.org <dnicoara@chromium.org>,
> joth@chromium.**org <joth@chromium.org>,alokp@chromium.org
>
>
> Please review this at
http://codereview.chromium.**org/8601005/<http://codereview.chromium.org/8601...
>
> SVN Base:
svn://svn.chromium.org/chrome/**trunk/src<http://svn.chromium.org/chrome/trunk/src>
>
> Affected files:
>  M ui/gfx/gl/gl_implementation_**linux.cc
>
>
> Index: ui/gfx/gl/gl_implementation_**linux.cc
> diff --git a/ui/gfx/gl/gl_implementation_**linux.cc
> b/ui/gfx/gl/gl_implementation_**linux.cc
> index eed0a15d9b746d0bf187d80359e9ee**5d1d1886e6..**
> c24c1f0200c7452f533c88e0f03185**d570e94978 100644
> --- a/ui/gfx/gl/gl_implementation_**linux.cc
> +++ b/ui/gfx/gl/gl_implementation_**linux.cc
> @@ -190,6 +190,7 @@ bool InitializeGLBindings(**GLImplementation
> implementation) {
>  bool InitializeGLExtensionBindings(**GLImplementation implementation,
>     GLContext* context) {
>   switch (implementation) {
> +#if !defined(USE_WAYLAND)
>     case kGLImplementationOSMesaGL:
>       InitializeGLExtensionBindingsG**L(context);
>       InitializeGLExtensionBindingsO**SMESA(context);
> @@ -198,6 +199,7 @@ bool InitializeGLExtensionBindings(**GLImplementation
> implementation,
>       InitializeGLExtensionBindingsG**L(context);
>       InitializeGLExtensionBindingsG**LX(context);
>       break;
> +#endif
>     case kGLImplementationEGLGLES2:
>       InitializeGLExtensionBindingsG**L(context);
>       InitializeGLExtensionBindingsE**GL(context);
>
>
>

[recbradford, 2011-11-18 10:13:53]

On 2011/11/18 05:05:21, Mandeep Singh Baines wrote:

I have an almost identical change locally - my patch also has:

 void GetAllowedGLImplementations(std::vector<GLImplementation>* impls) {
+#if (defined(USE_WAYLAND))
   impls->push_back(kGLImplementationEGLGLES2);
+#else
   impls->push_back(kGLImplementationDesktopGL);
   impls->push_back(kGLImplementationEGLGLES2);
   impls->push_back(kGLImplementationOSMesaGL);
+#endif
 }

[jonathan.backer, 2011-11-18 13:20:58]

lgtm

[Mandeep Singh Baines, 2011-11-18 17:29:10]

PTAL

Also fixed GetAllowedGLImplementations as suggested by recbradford.

[Mandeep Singh Baines, 2011-11-21 17:25:07]

ping

Hi Jonathon,

I made a change suggested by recbradford since your LGTM. Mind taking a second
peek.

Regards,
Mandeep

[jonathan.backer, 2011-11-21 20:00:49]

lgtm

[commit-bot: I haz the power, 2011-11-21 21:04:08]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/msb@chromium.org/8601005/4003

[commit-bot: I haz the power, 2011-11-21 22:24:51]

Change committed as 111013