Bug 152069 – [TexMap] Remove the TEXMAP_OPENGL_ES_2 define

• Status: RESOLVED
• Resolution: FIXED
• Component: New Bugs

[Zan Dobersek]

[TexMap] Remove the TEXMAP_OPENGL_ES_2 define

[Zan Dobersek]

Created attachment 267014 [details]
Patch

[Martin Robinson]

Comment on attachment 267014 [details]
Patch

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

> Source/WebCore/platform/graphics/texmap/BitmapTextureGL.cpp:-283
>      m_context3D->bindRenderbuffer(GraphicsContext3D::RENDERBUFFER, m_rbo);
> -#ifdef TEXMAP_OPENGL_ES_2
>      m_context3D->renderbufferStorage(GraphicsContext3D::RENDERBUFFER, GraphicsContext3D::STENCIL_INDEX8, m_textureSize.width(), m_textureSize.height());
> -#else
> -    m_context3D->renderbufferStorage(GraphicsContext3D::RENDERBUFFER, GraphicsContext3D::DEPTH_STENCIL, m_textureSize.width(), m_textureSize.height());
> -#endif

Hrm. What's going on here? I don't think that OpenGLES supports STENCIL_INDEX8 typically.

[Zan Dobersek]

Comment on attachment 267014 [details]
Patch

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

>> Source/WebCore/platform/graphics/texmap/BitmapTextureGL.cpp:-283
>> -#endif
> 
> Hrm. What's going on here? I don't think that OpenGLES supports STENCIL_INDEX8 typically.

ES2 does: https://www.khronos.org/opengles/sdk/docs/man/xhtml/glRenderbufferStorage.xml

We don't support ES, and it apparently doesn't provide glRenderbufferStorage() as well.

[Alex Christensen]

Comment on attachment 267014 [details]
Patch

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

r=me

> Source/WebCore/platform/graphics/texmap/BitmapTextureGL.cpp:48
> +#if OS(DARWIN)
>  #define GL_UNSIGNED_INT_8_8_8_8_REV 0x8367

We should probably eventually remove this hack, too.  If a value is not defined, it means we probably shouldn't use it.  GraphicsContext3DIOS.h has this:
#define GL_UNSIGNED_INT_8_8_8_8_REV GL_UNSIGNED_BYTE

GraphicsContext3DIOS.h is also a horrible hack, and should not be used as a good example of anything.

[Zan Dobersek]

Comment on attachment 267014 [details]
Patch

Clearing flags on attachment: 267014

Committed r193893: <http://trac.webkit.org/changeset/193893>

[Zan Dobersek]

All reviewed patches have been landed.  Closing bug.