Silently ignore attempts to delete default VAO.

The spec for glDeleteVertexArrays states that "Unused names in arrays are silently ignored, as is the value zero." b/116699321 Change-Id: I7cca0336dd9841b360f8fa20f6c0ac9677ec3ce1 Reviewed-on: https://swiftshader-review.googlesource.com/21048Reviewed-by: Chris Forbes <chrisforbes@google.com> Reviewed-by: Alexis Hétu <sugoi@google.com> Tested-by: Nicolas Capens <nicolascapens@google.com>

Silently ignore attempts to delete default VAO.
56eacf05 · Nicolas Capens · Nicolas Capens · 8c5ca8d1 · 56eacf05 · 56eacf05
Commit 56eacf05 authored Sep 27, 2018 by Nicolas Capens Committed by Nicolas Capens Sep 28, 2018
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

libGLESv2.cpp src/OpenGL/libGLESv2/libGLESv2.cpp +2 -2

libGLESv3.cpp src/OpenGL/libGLESv2/libGLESv3.cpp +4 -1

No files found.
--- a/src/OpenGL/libGLESv2/libGLESv2.cpp
+++ b/src/OpenGL/libGLESv2/libGLESv2.cpp
@@ -1179,7 +1179,7 @@ void DeleteFramebuffers(GLsizei n, const GLuint* framebuffers)
 	{
 		for(int i = 0; i < n; i++)
 		{
-			if(framebuffers[i] != 0)
+			if(framebuffers[i] != 0)   // Attempts to delete default framebuffer silently ignored.
 			{
 				context->deleteFramebuffer(framebuffers[i]);
 			}
@@ -1300,7 +1300,7 @@ void DeleteTextures(GLsizei n, const GLuint* textures)
 	{
 		for(int i = 0; i < n; i++)
 		{
-			if(textures[i] != 0)
+			if(textures[i] != 0)   // Attempts to delete default texture silently ignored.
 			{
 				context->deleteTexture(textures[i]);
 			}

--- a/src/OpenGL/libGLESv2/libGLESv3.cpp
+++ b/src/OpenGL/libGLESv2/libGLESv3.cpp
@@ -1499,9 +1499,12 @@ GL_APICALL void GL_APIENTRY glDeleteVertexArrays(GLsizei n, const GLuint *arrays
 	{
 		for(int i = 0; i < n; i++)
 		{
+			if(arrays[i] != 0)   // Attempts to delete default vertex array silently ignored.
+			{
 				context->deleteVertexArray(arrays[i]);
 			}
 		}
+	}
 }

 GL_APICALL void GL_APIENTRY glDeleteVertexArraysOES(GLsizei n, const GLuint *arrays)
@@ -3374,7 +3377,7 @@ GL_APICALL void GL_APIENTRY glDeleteTransformFeedbacks(GLsizei n, const GLuint *
 	{
 		for(int i = 0; i < n; i++)
 		{
-			if(ids[i] != 0)
+			if(ids[i] != 0)   // Attempts to delete default transform feedback silently ignored.
 			{
 				es2::TransformFeedback *transformFeedbackObject = context->getTransformFeedback(ids[i]);