mirror of
https://github.com/godotengine/godot-angle-static.git
synced 2026-01-06 02:09:55 +03:00
Fix typos in multi-draw extension specs
Bug: angleproject:1944 Change-Id: I21d63bab1054c99c55e5836ac08c4cf32dbe79d8 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3716582 Reviewed-by: Kenneth Russell <kbr@chromium.org> Commit-Queue: Kenneth Russell <kbr@chromium.org>
This commit is contained in:
Alexey Knyazev
committed by
Angle LUCI CQ
Angle LUCI CQ
parent
1dc3385aff
commit
26a314b45c
@@ -69,34 +69,34 @@ IP Status
|
||||
New Procedures and Functions
|
||||
|
||||
void DrawArraysInstancedBaseInstanceANGLE(enum mode,
|
||||
GLint first,
|
||||
GLsizei count,
|
||||
GLsizei instanceCount,
|
||||
GLuint baseInstance);
|
||||
int first,
|
||||
sizei count,
|
||||
sizei instanceCount,
|
||||
uint baseInstance);
|
||||
|
||||
void DrawElementsInstancedBaseVertexBaseInstanceANGLE(GLenum mode,
|
||||
GLsizei count,
|
||||
GLenum type,
|
||||
const GLvoid *indices,
|
||||
GLsizei instanceCount,
|
||||
GLint baseVertex,
|
||||
GLuint baseInstance);
|
||||
void DrawElementsInstancedBaseVertexBaseInstanceANGLE(enum mode,
|
||||
sizei count,
|
||||
enum type,
|
||||
const void *indices,
|
||||
sizei instanceCount,
|
||||
int baseVertex,
|
||||
uint baseInstance);
|
||||
|
||||
void MultiDrawArraysInstancedBaseInstanceANGLE(enum mode,
|
||||
const GLint* firsts,
|
||||
const GLsizei* counts,
|
||||
const GLsizei* instanceCounts,
|
||||
const GLuint* baseInstances,
|
||||
const GLsizei drawcount);
|
||||
const int *firsts,
|
||||
const sizei *counts,
|
||||
const sizei *instanceCounts,
|
||||
const uint *baseInstances,
|
||||
sizei drawcount);
|
||||
|
||||
void MultiDrawElementsInstancedBaseVertexBaseInstanceANGLE(enum mode,
|
||||
const GLint* counts,
|
||||
GLenum type,
|
||||
const GLvoid* const* indices,
|
||||
const GLsizei* instanceCounts,
|
||||
const GLint* baseVertices,
|
||||
const GLuint* baseInstances,
|
||||
const GLsizei drawcount);
|
||||
const sizei *counts,
|
||||
enum type,
|
||||
const void *const *indices,
|
||||
const sizei *instanceCounts,
|
||||
const int *baseVertices,
|
||||
const uint *baseInstances,
|
||||
sizei drawcount);
|
||||
|
||||
New Tokens
|
||||
|
||||
@@ -108,23 +108,25 @@ Additions to Chapter 10 of the OpenGL ES 3.2 Specification
|
||||
|
||||
The command
|
||||
|
||||
void DrawArraysInstancedBaseInstanceANGLE (GLenum mode,
|
||||
GLint first,
|
||||
GLsizei count,
|
||||
GLsizei instanceCount,
|
||||
GLuint baseInstance);
|
||||
void DrawArraysInstancedBaseInstanceANGLE(
|
||||
enum mode,
|
||||
int first,
|
||||
sizei count,
|
||||
sizei instanceCount,
|
||||
uint baseInstance);
|
||||
|
||||
Behaves identically to DrawArraysInstanced except that <baseInstance> is
|
||||
passed down to DrawArraysOneInstance instead of zero.
|
||||
|
||||
The command
|
||||
|
||||
void MultiDrawArraysInstancedBaseInstanceANGLE(GLenum mode,
|
||||
const GLint* firsts,
|
||||
const GLsizei* counts,
|
||||
const GLsizei* instanceCounts,
|
||||
const GLuint* baseInstances,
|
||||
GLsizei drawcount);
|
||||
void MultiDrawArraysInstancedBaseInstanceANGLE(
|
||||
enum mode,
|
||||
const int *firsts,
|
||||
const sizei *counts,
|
||||
const sizei *instanceCounts,
|
||||
const uint *baseInstances,
|
||||
sizei drawcount);
|
||||
|
||||
Behaves identically to DrawArraysInstancedBaseInstanceANGLE except that a
|
||||
list of arrays is specified instead. The number of lists is specified in
|
||||
@@ -145,27 +147,29 @@ Additions to Chapter 10 of the OpenGL ES 3.2 Specification
|
||||
|
||||
The command
|
||||
|
||||
void DrawElementsInstancedBaseVertexBaseInstanceANGLE (GLenum mode,
|
||||
GLsizei count,
|
||||
GLenum type,
|
||||
const GLvoid* indices,
|
||||
GLsizei instanceCount,
|
||||
GLint baseVertex,
|
||||
GLuint baseInstance);
|
||||
void DrawElementsInstancedBaseVertexBaseInstanceANGLE(
|
||||
enum mode,
|
||||
sizei count,
|
||||
enum type,
|
||||
const void *indices,
|
||||
sizei instanceCount,
|
||||
int baseVertex,
|
||||
uint baseInstance);
|
||||
|
||||
Behaves identically to DrawElementsInstanced except that <baseVertex> and
|
||||
<baseInstance> are passed down to DrawElementsOneInstance instead of zero.
|
||||
|
||||
The command
|
||||
|
||||
void MultiDrawElementsInstancedBaseVertexBaseInstanceANGLE(GLenum mode,
|
||||
const GLsizei* counts,
|
||||
GLenum type,
|
||||
const GLvoid* const* indices,
|
||||
const GLsizei* instanceCounts,
|
||||
const GLint* baseVertices,
|
||||
const GLuint* baseInstances,
|
||||
GLsizei drawcount);
|
||||
void MultiDrawElementsInstancedBaseVertexBaseInstanceANGLE(
|
||||
enum mode,
|
||||
const sizei *counts,
|
||||
enum type,
|
||||
const void *const *indices,
|
||||
const sizei *instanceCounts,
|
||||
const int *baseVertices,
|
||||
const uint *baseInstances,
|
||||
sizei drawcount);
|
||||
|
||||
Behaves identically to DrawElementsInstancedBaseVertexBaseInstanceANGLE
|
||||
except that a list of arrays is specified instead. The number of lists is
|
||||
@@ -193,7 +197,7 @@ Errors
|
||||
generate the same errors as DrawArraysInstanced and DrawElementsInstanced.
|
||||
|
||||
MultiDrawArraysInstancedBaseInstanceANGLE and
|
||||
MultiDrawElementsInstancedBaseVertexBaseInstanceANGL
|
||||
MultiDrawElementsInstancedBaseVertexBaseInstanceANGLE
|
||||
generate the same errors as DrawArraysInstanced and DrawElementsInstanced,
|
||||
respectively, for any draw <i> where an error is generated. If any call
|
||||
would produce an error, no drawing is performed.
|
||||
@@ -214,8 +218,9 @@ Issues
|
||||
|
||||
Revision History
|
||||
|
||||
Rev. Date Author Changes
|
||||
---- -------- ---------- --------------------------------------------
|
||||
1 08/13/19 Shrek Shao First revision.
|
||||
2 07/14/20 Shrek Shao Fix baseInstance type from GLint to GLuint.
|
||||
3 11/19/21 Shrek Shao Decouple gl_BaseVertex/gl_BaseInstance.
|
||||
Rev. Date Author Changes
|
||||
---- -------- ---------------- --------------------------------------------
|
||||
1 08/13/19 Shrek Shao First revision.
|
||||
2 07/14/20 Shrek Shao Fix baseInstance type from GLint to GLuint.
|
||||
3 11/19/21 Shrek Shao Decouple gl_BaseVertex/gl_BaseInstance.
|
||||
4 06/21/22 Alexey Knyazev Fixed typos and type usage.
|
||||
|
||||
@@ -67,20 +67,22 @@ Additions to Chapter 10 of the OpenGL ES 3.2 Specification
|
||||
The base index of the instance may be read by a vertex shader as
|
||||
<gl_BaseInstance>, for the commands
|
||||
|
||||
void DrawArraysInstancedBaseInstanceANGLE (GLenum mode,
|
||||
GLint first,
|
||||
GLsizei count,
|
||||
GLsizei instanceCount,
|
||||
GLuint baseInstance);
|
||||
void DrawArraysInstancedBaseInstanceANGLE(
|
||||
enum mode,
|
||||
int first,
|
||||
sizei count,
|
||||
sizei instanceCount,
|
||||
uint baseInstance);
|
||||
|
||||
and
|
||||
|
||||
void MultiDrawArraysInstancedBaseInstanceANGLE(GLenum mode,
|
||||
const GLint* firsts,
|
||||
const GLsizei* counts,
|
||||
const GLsizei* instanceCounts,
|
||||
const GLuint* baseInstances,
|
||||
GLsizei drawcount);
|
||||
void MultiDrawArraysInstancedBaseInstanceANGLE(
|
||||
enum mode,
|
||||
const int *firsts,
|
||||
const sizei *counts,
|
||||
const sizei *instanceCounts,
|
||||
const uint *baseInstances,
|
||||
sizei drawcount);
|
||||
|
||||
The base index of the vertex may be read by a vertex shader as
|
||||
<gl_BaseVertex>. This value is also added to the <gl_VertexID>.
|
||||
@@ -89,24 +91,26 @@ Additions to Chapter 10 of the OpenGL ES 3.2 Specification
|
||||
<gl_BaseInstance>. Note that this value is not added to the
|
||||
<gl_InstanceID>, for the commands
|
||||
|
||||
void DrawElementsInstancedBaseVertexBaseInstanceANGLE (GLenum mode,
|
||||
GLsizei count,
|
||||
GLenum type,
|
||||
const GLvoid* indices,
|
||||
GLsizei instanceCount,
|
||||
GLint baseVertex,
|
||||
GLuint baseInstance);
|
||||
void DrawElementsInstancedBaseVertexBaseInstanceANGLE(
|
||||
enum mode,
|
||||
sizei count,
|
||||
enum type,
|
||||
const void *indices,
|
||||
sizei instanceCount,
|
||||
int baseVertex,
|
||||
uint baseInstance);
|
||||
|
||||
and
|
||||
|
||||
void MultiDrawElementsInstancedBaseVertexBaseInstanceANGLE(GLenum mode,
|
||||
const GLsizei* counts,
|
||||
GLenum type,
|
||||
const GLvoid* const* indices,
|
||||
const GLsizei* instanceCounts,
|
||||
const GLint* baseVertices,
|
||||
const GLuint* baseInstances,
|
||||
GLsizei drawcount);
|
||||
void MultiDrawElementsInstancedBaseVertexBaseInstanceANGLE(
|
||||
enum mode,
|
||||
const sizei *counts,
|
||||
enum type,
|
||||
const void *const *indices,
|
||||
const sizei *instanceCounts,
|
||||
const int *baseVertices,
|
||||
const uint *baseInstances,
|
||||
sizei drawcount);
|
||||
|
||||
Errors
|
||||
|
||||
@@ -132,6 +136,7 @@ Issues
|
||||
|
||||
Revision History
|
||||
|
||||
Rev. Date Author Changes
|
||||
---- -------- ---------- --------------------------------------------
|
||||
1 11/19/21 Shrek Shao First revision.
|
||||
Rev. Date Author Changes
|
||||
---- -------- ---------------- --------------------------------------------
|
||||
1 11/19/21 Shrek Shao First revision.
|
||||
2 06/21/22 Alexey Knyazev Fixed typos and type usage.
|
||||
|
||||
@@ -65,28 +65,28 @@ IP Status
|
||||
New Procedures and Functions
|
||||
|
||||
void MultiDrawArraysANGLE(enum mode,
|
||||
const GLint* firsts,
|
||||
const GLsizei* counts,
|
||||
const GLsizei drawcount);
|
||||
const int *firsts,
|
||||
const sizei *counts,
|
||||
sizei drawcount);
|
||||
|
||||
void MultiDrawElementsANGLE(enum mode,
|
||||
const GLint* counts,
|
||||
GLenum type,
|
||||
const GLvoid* const* indices,
|
||||
const GLsizei drawcount);
|
||||
const sizei *counts,
|
||||
enum type,
|
||||
const void *const *indices,
|
||||
sizei drawcount);
|
||||
|
||||
void MultiDrawArraysInstancedANGLE(enum mode,
|
||||
const GLint* firsts,
|
||||
const GLsizei* counts,
|
||||
const GLsizei* instanceCounts,
|
||||
const GLsizei drawcount);
|
||||
const int *firsts,
|
||||
const sizei *counts,
|
||||
const sizei *instanceCounts,
|
||||
sizei drawcount);
|
||||
|
||||
void MultiDrawElementsInstancedANGLE(enum mode,
|
||||
const GLint* counts,
|
||||
GLenum type,
|
||||
const GLvoid* const* indices,
|
||||
const GLsizei* instanceCounts,
|
||||
const GLsizei drawcount);
|
||||
const sizei *counts,
|
||||
enum type,
|
||||
const void *const *indices,
|
||||
const sizei *instanceCounts,
|
||||
sizei drawcount);
|
||||
|
||||
New Tokens
|
||||
|
||||
@@ -98,10 +98,11 @@ Additions to Chapter 2 of the OpenGL ES 2.0 Specification
|
||||
|
||||
The command
|
||||
|
||||
void MultiDrawArraysANGLE(GLenum mode,
|
||||
const GLint* firsts,
|
||||
const GLsizei *counts,
|
||||
GLsizei drawcount)
|
||||
void MultiDrawArraysANGLE(
|
||||
enum mode,
|
||||
const int *firsts,
|
||||
const sizei *counts,
|
||||
sizei drawcount)
|
||||
|
||||
Behaves identically to DrawArrays except that a list of arrays is
|
||||
specified instead. The number of lists is specified in the drawcount
|
||||
@@ -116,11 +117,12 @@ Additions to Chapter 2 of the OpenGL ES 2.0 Specification
|
||||
|
||||
The command
|
||||
|
||||
void MultiDrawElementsANGLE(GLenum mode,
|
||||
GLsizei* counts,
|
||||
GLenum type,
|
||||
const GLvoid* const* indices,
|
||||
GLsizei drawcount)
|
||||
void MultiDrawElementsANGLE(
|
||||
enum mode,
|
||||
const sizei *counts,
|
||||
enum type,
|
||||
const void *const *indices,
|
||||
sizei drawcount)
|
||||
|
||||
Behaves identically to DrawElements except that a list of arrays is
|
||||
specified instead. The number of lists is specified in the drawcount
|
||||
@@ -141,12 +143,12 @@ Additions to Chapter 2 of the OpenGL ES 3.0 Specification
|
||||
|
||||
The command
|
||||
|
||||
void MultiDrawArraysInstancedANGLE(
|
||||
GLenum mode,
|
||||
const GLint* firsts,
|
||||
const GLsizei *counts,
|
||||
const GLsizei* instanceCounts,
|
||||
GLsizei drawcount)
|
||||
void MultiDrawArraysInstancedANGLE(
|
||||
enum mode,
|
||||
const int *firsts,
|
||||
const sizei *counts,
|
||||
const sizei *instanceCounts,
|
||||
sizei drawcount)
|
||||
|
||||
Behaves identically to DrawArraysInstanced except that a list of arrays is
|
||||
specified instead. The number of lists is specified in the drawcount
|
||||
@@ -162,13 +164,13 @@ Additions to Chapter 2 of the OpenGL ES 3.0 Specification
|
||||
|
||||
The command
|
||||
|
||||
void MultiDrawElementsInstancedANGLE(
|
||||
GLenum mode,
|
||||
GLsizei* counts,
|
||||
GLenum type,
|
||||
const GLvoid* const* indices,
|
||||
const GLsizei* instanceCounts,
|
||||
GLsizei drawcount)
|
||||
void MultiDrawElementsInstancedANGLE(
|
||||
enum mode,
|
||||
sizei *counts,
|
||||
enum type,
|
||||
const void *const *indices,
|
||||
const sizei *instanceCounts,
|
||||
sizei drawcount)
|
||||
|
||||
Behaves identically to DrawElementsInstanced except that a list of arrays is
|
||||
specified instead. The number of lists is specified in the drawcount
|
||||
@@ -226,7 +228,8 @@ Issues
|
||||
|
||||
Revision History
|
||||
|
||||
Rev. Date Author Changes
|
||||
---- -------- ---------- --------------------------------------------
|
||||
1 10/24/18 Austin Eng First revision.
|
||||
2 10/25/18 Austin Eng Second revision. Add instanced variants
|
||||
Rev. Date Author Changes
|
||||
---- -------- ---------------- --------------------------------------------
|
||||
1 10/24/18 Austin Eng First revision.
|
||||
2 10/25/18 Austin Eng Add instanced variants.
|
||||
3 06/21/22 Alexey Knyazev Fixed typos and type usage.
|
||||
Reference in New Issue
Block a user