ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

GL: hey, ANGLE, fuck off with those pretentious requirements. 

This extension is YOUR OWN PRIVATE thing, so why you say it requires
ES 3.1 while you expose ES 3.0 at most?!
pull/240/head
Vladimír Vondruš 5 years ago
parent
b30d313ecd
commit
895fddb28b
2 changed files with 29 additions and 13 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 38
      src/Magnum/GL/AbstractShaderProgram.h
  2. 4
      src/Magnum/GL/Extensions.h

38
src/Magnum/GL/AbstractShaderProgram.h
Unescape View File

@ -976,13 +976,18 @@ class MAGNUM_GL_EXPORT AbstractShaderProgram: public AbstractObject {
* @ref draw(Mesh&, const Containers::StridedArrayView1D<const UnsignedInt>&, const Containers::StridedArrayView1D<const UnsignedInt>&, const Containers::StridedArrayView1D<const UnsignedInt>&, const Containers::StridedArrayView1D<const UnsignedInt>&) without the
* @p instanceOffsets parameter there instead.
* @requires_es_extension Extension @m_class{m-doc-external} [ANGLE_multi_draw](https://chromium.googlesource.com/angle/angle/+/master/extensions/ANGLE_multi_draw.txt)
* @requires_es_extension OpenGL ES 3.1 and extension
* @requires_es_extension OpenGL ES 3.0 and extension
* @m_class{m-doc-external} [ANGLE_base_vertex_base_instance](https://chromium.googlesource.com/angle/angle/+/refs/heads/main/extensions/ANGLE_base_vertex_base_instance.txt)
* if the mesh is indexed and the @p vertexOffsets view is not
* empty
* @requires_es_extension OpenGL ES 3.1 and extension
* empty. The extension says ES 3.1 is required, but since ANGLE
* is the only implementer of this extension and exposes just ES
* 3.0, there's no point in requiring 3.1.
* @requires_es_extension OpenGL ES 3.0 and extension
* @m_class{m-doc-external} [ANGLE_base_vertex_base_instance](https://chromium.googlesource.com/angle/angle/+/refs/heads/main/extensions/ANGLE_base_vertex_base_instance.txt)
* if the @p instanceOffsets view is not empty
* if the @p instanceOffsets view is not empty. The extension says
* ES 3.1 is required, but since ANGLE is the only implementer of
* this extension and exposes just ES 3.0, there's no point in
* requiring 3.1.
* @requires_webgl_extension Extension @webgl_extension{WEBGL,multi_draw}.
* Note that this extension is only implemented since Emscripten
* 2.0.0 and thus it's not even advertised on older versions.
@ -1015,13 +1020,18 @@ class MAGNUM_GL_EXPORT AbstractShaderProgram: public AbstractObject {
* @ref draw(Mesh&, const Containers::StridedArrayView1D<const UnsignedInt>&, const Containers::StridedArrayView1D<const UnsignedInt>&, const Containers::StridedArrayView1D<const UnsignedInt>&, const Containers::StridedArrayView1D<const UnsignedInt>&) without the
* @p instanceOffsets parameter there instead.
* @requires_es_extension Extension @m_class{m-doc-external} [ANGLE_multi_draw](https://chromium.googlesource.com/angle/angle/+/master/extensions/ANGLE_multi_draw.txt)
* @requires_es_extension OpenGL ES 3.1 and extension
* @requires_es_extension OpenGL ES 3.0 and extension
* @m_class{m-doc-external} [ANGLE_base_vertex_base_instance](https://chromium.googlesource.com/angle/angle/+/refs/heads/main/extensions/ANGLE_base_vertex_base_instance.txt)
* if the mesh is indexed and the @p vertexOffsets view is not
* empty
* @requires_es_extension OpenGL ES 3.1 and extension
* empty. The extension says ES 3.1 is required, but since ANGLE
* is the only implementer of this extension and exposes only ES
* 3.0, there's no point in requiring 3.1.
* @requires_es_extension OpenGL ES 3.0 and extension
* @m_class{m-doc-external} [ANGLE_base_vertex_base_instance](https://chromium.googlesource.com/angle/angle/+/refs/heads/main/extensions/ANGLE_base_vertex_base_instance.txt)
* if the @p instanceOffsets view is not empty
* if the @p instanceOffsets view is not empty. The extension says
* ES 3.1 is required, but since ANGLE is the only implementer of
* this extension and exposes only ES 3.0, there's no point in
* requiring 3.1.
* @requires_webgl_extension Extension @webgl_extension{WEBGL,multi_draw}
* @requires_webgl_extension WebGL 2.0 and extension
* @webgl_extension{WEBGL,multi_draw_instanced_base_vertex_base_instance}
@ -1057,10 +1067,12 @@ class MAGNUM_GL_EXPORT AbstractShaderProgram: public AbstractObject {
*
* @requires_gles_only Not available on desktop OpenGL.
* @requires_es_extension Extension @m_class{m-doc-external} [ANGLE_multi_draw](https://chromium.googlesource.com/angle/angle/+/master/extensions/ANGLE_multi_draw.txt)
* @requires_es_extension OpenGL ES 3.1 and extension
* @requires_es_extension OpenGL ES 3.0 and extension
* @m_class{m-doc-external} [ANGLE_base_vertex_base_instance](https://chromium.googlesource.com/angle/angle/+/refs/heads/main/extensions/ANGLE_base_vertex_base_instance.txt)
* if the mesh is indexed and the @p vertexOffsets view is not
* empty
* empty. The extension says ES 3.1 is required, but since ANGLE
* is the only implementer of this extension and exposes just ES
* 3.0, there's no point in requiring 3.1.
* @requires_webgl_extension Extension @webgl_extension{WEBGL,multi_draw}
* @requires_webgl_extension WebGL 2.0 and extension
* @webgl_extension{WEBGL,multi_draw_instanced_base_vertex_base_instance}
@ -1084,10 +1096,12 @@ class MAGNUM_GL_EXPORT AbstractShaderProgram: public AbstractObject {
* it's contiguous. See the original overload for further information.
* @requires_gles_only Not available on desktop OpenGL.
* @requires_es_extension Extension @m_class{m-doc-external} [ANGLE_multi_draw](https://chromium.googlesource.com/angle/angle/+/master/extensions/ANGLE_multi_draw.txt)
* @requires_es_extension OpenGL ES 3.1 and extension
* @requires_es_extension OpenGL ES 3.0 and extension
* @m_class{m-doc-external} [ANGLE_base_vertex_base_instance](https://chromium.googlesource.com/angle/angle/+/refs/heads/main/extensions/ANGLE_base_vertex_base_instance.txt)
* if the mesh is indexed and the @p vertexOffsets view is not
* empty
* empty. The extension says ES 3.1 is required, but since ANGLE
* is the only implementer of this extension and exposes just ES
* 3.0, there's no point in requiring 3.1.
* @requires_webgl_extension Extension @webgl_extension{WEBGL,multi_draw}
* @requires_webgl_extension WebGL 2.0 and extension
* @webgl_extension{WEBGL,multi_draw_instanced_base_vertex_base_instance}

4
src/Magnum/GL/Extensions.h
Unescape View File

@ -374,7 +374,9 @@ namespace ANDROID {
(which doesn't even follow the XML schema, so it had to be fixed). */
_extension( 9,ANGLE,multi_draw, GLES200, None) // #???
#ifndef MAGNUM_TARGET_GLES2
_extension( 10,ANGLE,base_vertex_base_instance, GLES310, None) // #???
/* The spec says ES 3.1 is required, but ANGLE itself reports just ES 3.0
and this is THE ONLY SINGLE IMPLEMENTER so what gives?! */
_extension( 10,ANGLE,base_vertex_base_instance, GLES300, None) // #???
#endif
} namespace APPLE {
#ifdef MAGNUM_TARGET_GLES2

Write Preview
Loading…
Cancel
Save