diff options
| author | Austin Eng <enga@chromium.org> | 2018-11-21 18:09:05 -0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2018-11-28 01:50:44 +0000 |
| commit | 3b7c9d099b0da0e70ebe9a0d73cfa644ee1c4901 (patch) | |
| tree | 77c8a531e4706a57a3f6d8beca9396e85ba93fc6 /extensions | |
| parent | 4f6592fa4ce9534b7ec66c13f6f21dbd6a1c234a (diff) | |
| download | angle-3b7c9d099b0da0e70ebe9a0d73cfa644ee1c4901.tar.gz | |
Change offsets in MultiDrawElements* entrypoints to match glMultiDrawElements
This patch changes arguments for MultiDrawElements and
MultiDrawElementsInstanced from from GLsizei *offsets to
const* GLvoid* indices.
Bug: chromium:890539
Change-Id: I2124cf2daeaa6af0f889f3c46aa2b8c77be200a6
Reviewed-on: https://chromium-review.googlesource.com/c/1352591
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Kai Ninomiya <kainino@chromium.org>
Commit-Queue: Austin Eng <enga@chromium.org>
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/ANGLE_multi_draw.txt | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/extensions/ANGLE_multi_draw.txt b/extensions/ANGLE_multi_draw.txt index c71996cd07..2f6826658f 100644 --- a/extensions/ANGLE_multi_draw.txt +++ b/extensions/ANGLE_multi_draw.txt @@ -72,7 +72,7 @@ New Procedures and Functions void MultiDrawElementsANGLE(enum mode, const GLint* counts, GLenum type, - const GLsizei* offsets, + const GLvoid* const* indices, const GLsizei drawcount); void MultiDrawArraysInstancedANGLE(enum mode, @@ -84,7 +84,7 @@ New Procedures and Functions void MultiDrawElementsInstancedANGLE(enum mode, const GLint* counts, GLenum type, - const GLsizei* offsets, + const GLvoid* const* indices, const GLsizei* instanceCounts, const GLsizei drawcount); @@ -119,7 +119,7 @@ Additions to Chapter 2 of the OpenGL ES 2.0 Specification void MultiDrawElementsANGLE(GLenum mode, GLsizei* counts, GLenum type, - GLsizei* offsets, + const GLvoid* const* indices, GLsizei drawcount) Behaves identically to DrawElements except that a list of arrays is @@ -127,8 +127,9 @@ Additions to Chapter 2 of the OpenGL ES 2.0 Specification parameter. It has the same effect as: for(i=0; i<drawcount; i++) { - if (*(counts+i)>0) DrawElements(mode, *(counts+i), type, - (const void*)(long)(*(offsets+i))); + if (*(counts+i)>0) { + DrawElements(mode, *(counts+i), type, *(indices+i)); + } } The index of the draw (<i> in the above pseudo-code) may be read by @@ -165,7 +166,7 @@ Additions to Chapter 2 of the OpenGL ES 3.0 Specification GLenum mode, GLsizei* counts, GLenum type, - GLsizei* offsets, + const GLvoid* const* indices, const GLsizei* instanceCounts, GLsizei drawcount) @@ -174,8 +175,10 @@ Additions to Chapter 2 of the OpenGL ES 3.0 Specification parameter. It has the same effect as: for(i=0; i<drawcount; i++) { - if (*(counts+i)>0) DrawElementsInstanced(mode, *(counts+i), type, - (const void*)(long)(*(offsets+i)), *(instanceCounts+1)); + if (*(counts+i)>0) { + DrawElementsInstanced(mode, *(counts+i), type, + *(indices+i), *(instanceCounts+1)); + } } The index of the draw (<i> in the above pseudo-code) may be read by |