Bug 127465 – Support ANGLE_instanced_arrays for linux

• Status: RESOLVED
• Resolution: FIXED
• Component: WebGL

[ChangSeok Oh]

ANGLE_instanced_arrays is supported by Mac only. https://bugs.webkit.org/show_bug.cgi?id=127257
We need to fill blanks for linux platform either.

[ChangSeok Oh]

Created attachment 223704 [details]
Patch

[WebKit Commit Bot]

Attachment 223704 [details] did not pass style-queue:


ERROR: Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:358:  Wrong number of spaces before statement. (expected: 8)  [whitespace/indent] [4]
ERROR: Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:364:  Wrong number of spaces before statement. (expected: 8)  [whitespace/indent] [4]
ERROR: Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:370:  Wrong number of spaces before statement. (expected: 8)  [whitespace/indent] [4]
Total errors found: 3 in 6 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[ChangSeok Oh]

(In reply to comment #2)
> Attachment 223704 [details] did not pass style-queue:
> 
> 
> ERROR: Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:358:  Wrong number of spaces before statement. (expected: 8)  [whitespace/indent] [4]
> ERROR: Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:364:  Wrong number of spaces before statement. (expected: 8)  [whitespace/indent] [4]
> ERROR: Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:370:  Wrong number of spaces before statement. (expected: 8)  [whitespace/indent] [4]
> Total errors found: 3 in 6 files
> 
> 
> If any of these errors are false positives, please file a bug against check-webkit-style.

I believe these are false alarms.

[ChangSeok Oh]

Created attachment 223709 [details]
Patch

[WebKit Commit Bot]

Attachment 223709 [details] did not pass style-queue:


ERROR: Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:358:  Wrong number of spaces before statement. (expected: 8)  [whitespace/indent] [4]
ERROR: Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:364:  Wrong number of spaces before statement. (expected: 8)  [whitespace/indent] [4]
ERROR: Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:370:  Wrong number of spaces before statement. (expected: 8)  [whitespace/indent] [4]
Total errors found: 3 in 6 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[ChangSeok Oh]

Comment on attachment 223709 [details]
Patch

Thanks!

[WebKit Commit Bot]

Comment on attachment 223709 [details]
Patch

Clearing flags on attachment: 223709

Committed r163858: <http://trac.webkit.org/changeset/163858>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.

[Dean Jackson]

Comment on attachment 223709 [details]
Patch

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

> Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:371
>  void GraphicsContext3D::drawArraysInstanced(GC3Denum mode, GC3Dint first, GC3Dsizei count, GC3Dsizei primcount)
>  {
> -    UNUSED_PARAM(mode);
> -    UNUSED_PARAM(first);
> -    UNUSED_PARAM(count);
> -    UNUSED_PARAM(primcount);
> +    makeContextCurrent();
> +    ::glDrawArraysInstanced(mode, first, count, primcount);
>  }
>  
>  void GraphicsContext3D::drawElementsInstanced(GC3Denum mode, GC3Dsizei count, GC3Denum type, GC3Dintptr offset, GC3Dsizei primcount)
>  {
> -    UNUSED_PARAM(mode);
> -    UNUSED_PARAM(count);
> -    UNUSED_PARAM(type);
> -    UNUSED_PARAM(offset);
> -    UNUSED_PARAM(primcount);
> +    makeContextCurrent();
> +    ::glDrawElementsInstanced(mode, count, type, reinterpret_cast<GLvoid*>(static_cast<intptr_t>(offset)), primcount);
>  }
>  
>  void GraphicsContext3D::vertexAttribDivisor(GC3Duint index, GC3Duint divisor)
>  {
> -    UNUSED_PARAM(index);
> -    UNUSED_PARAM(divisor);
> +    makeContextCurrent();
> +    ::glVertexAttribDivisor(index, divisor);
>  }

I expect we could merge the COCOA code into here too.

[ChangSeok Oh]

(In reply to comment #9)
> (From update of attachment 223709 [details])
> View in context: https://bugs.webkit.org/attachment.cgi?id=223709&action=review
> 
> > Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:371
> >  void GraphicsContext3D::drawArraysInstanced(GC3Denum mode, GC3Dint first, GC3Dsizei count, GC3Dsizei primcount)
> >  {
> > -    UNUSED_PARAM(mode);
> > -    UNUSED_PARAM(first);
> > -    UNUSED_PARAM(count);
> > -    UNUSED_PARAM(primcount);
> > +    makeContextCurrent();
> > +    ::glDrawArraysInstanced(mode, first, count, primcount);
> >  }
> >  
> >  void GraphicsContext3D::drawElementsInstanced(GC3Denum mode, GC3Dsizei count, GC3Denum type, GC3Dintptr offset, GC3Dsizei primcount)
> >  {
> > -    UNUSED_PARAM(mode);
> > -    UNUSED_PARAM(count);
> > -    UNUSED_PARAM(type);
> > -    UNUSED_PARAM(offset);
> > -    UNUSED_PARAM(primcount);
> > +    makeContextCurrent();
> > +    ::glDrawElementsInstanced(mode, count, type, reinterpret_cast<GLvoid*>(static_cast<intptr_t>(offset)), primcount);
> >  }
> >  
> >  void GraphicsContext3D::vertexAttribDivisor(GC3Duint index, GC3Duint divisor)
> >  {
> > -    UNUSED_PARAM(index);
> > -    UNUSED_PARAM(divisor);
> > +    makeContextCurrent();
> > +    ::glVertexAttribDivisor(index, divisor);
> >  }
> 
> I expect we could merge the COCOA code into here too.

Yeap. I'll do!