Change ANGLE_multiview's enum values

The enums introduced by the ANGLE_multiview extension are changed to use the values reserved specifically for ANGLE. BUG=angleproject:2062 TEST=angle_end2end_tests Change-Id: Ib668f2e0e9022442a432b1a04050aeb2ff82a3d1 Reviewed-on: https://chromium-review.googlesource.com/654864Reviewed-by: Geoff Lang <geofflang@chromium.org> Commit-Queue: Martin Radev <mradev@nvidia.com>

Change ANGLE_multiview's enum values
7cadfcc7 · Martin Radev · Commit Bot · 61e710b6 · 7cadfcc7
Commit 7cadfcc7 authored Sep 07, 2017 by Martin Radev Committed by Commit Bot Sep 07, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 5 deletions

gl2ext_angle.h include/GLES2/gl2ext_angle.h +6 -5

No files found.
--- a/include/GLES2/gl2ext_angle.h
+++ b/include/GLES2/gl2ext_angle.h
@@ -520,15 +520,16 @@ GL_APICALL void GL_APIENTRY glGetQueryObjectui64vRobustANGLE(GLuint id, GLenum p

 #ifndef GL_ANGLE_multiview
 #define GL_ANGLE_multiview 1
+// The next four enums coincide with the enums introduced by the GL_OVR_multiview extension and use the values reserved by that extension.
 #define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_NUM_VIEWS_ANGLE 0x9630
 #define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_BASE_VIEW_INDEX_ANGLE 0x9632
 #define GL_MAX_VIEWS_ANGLE 0x9631
 #define GL_FRAMEBUFFER_INCOMPLETE_VIEW_TARGETS_ANGLE 0x9633
-// TODO (mradev): change to the correct values once the tokens are allocated by Khronos.
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_VIEWPORT_OFFSETS_ANGLE 0x9634
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_MULTIVIEW_LAYOUT_ANGLE 0x9635
-#define GL_FRAMEBUFFER_MULTIVIEW_SIDE_BY_SIDE_ANGLE 0x9636
-#define GL_FRAMEBUFFER_MULTIVIEW_LAYERED_ANGLE 0x9637
+// The next four enums are reserved specifically for ANGLE.
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_VIEWPORT_OFFSETS_ANGLE 0x969B
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_MULTIVIEW_LAYOUT_ANGLE 0x969C
+#define GL_FRAMEBUFFER_MULTIVIEW_SIDE_BY_SIDE_ANGLE 0x969D
+#define GL_FRAMEBUFFER_MULTIVIEW_LAYERED_ANGLE 0x969E
 typedef void(GL_APIENTRYP PFNGLFRAMEBUFFERTEXTUREMULTIVIEWLAYEREDANGLE)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint baseViewIndex, GLsizei numViews);
 typedef void(GL_APIENTRYP PFNGLFRAMEBUFFERTEXTUREMULTIVIEWSIDEBYSIDEANGLE)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLsizei numViews, const GLint *viewportOffsets);
 #ifdef GL_GLEXT_PROTOTYPES