From 9b0589840b66c8ddbc4d11e582955708b0a4bc58 Mon Sep 17 00:00:00 2001 From: BZLZHH Date: Fri, 31 Oct 2025 15:29:25 +0800 Subject: [PATCH] [Fix] (MG_Test/VertexArrayTest): Allow default VAO. --- .../MG_Test/VertexArray/VertexArrayTest.cpp | 26 +++++-------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/MobileGL/MG_Test/VertexArray/VertexArrayTest.cpp b/MobileGL/MG_Test/VertexArray/VertexArrayTest.cpp index 7f727e9c..a6ae8bf5 100644 --- a/MobileGL/MG_Test/VertexArray/VertexArrayTest.cpp +++ b/MobileGL/MG_Test/VertexArray/VertexArrayTest.cpp @@ -37,8 +37,9 @@ TEST_F(VertexArrayTest, GenerateAndBindVAO) { glContext.BindVertexArray(vaoNames[1]); ASSERT_EQ(glContext.GetBoundVertexArray(), vao1); - glContext.BindVertexArray(0); - ASSERT_EQ(glContext.GetBoundVertexArray(), nullptr); + // glContext.BindVertexArray(0); + // ASSERT_EQ(glContext.GetBoundVertexArray(), nullptr); + // Do not detect if it supports default VAO } TEST_F(VertexArrayTest, VertexAttributeSetup) { @@ -406,21 +407,6 @@ TEST_F(GeneralVertexArrayTest, General_ComplexUsage) { EXPECT_EQ(GetError(), GL_NO_ERROR); } -TEST_F(GeneralVertexArrayTest, General_BindWithoutCreation) { - GLuint vao = 1; - - BindVertexArray(vao); - EXPECT_EQ(GetError(), GL_INVALID_OPERATION); - - EXPECT_EQ(MG_State::pGLContext->GetVertexArrayObject(vao), nullptr); - - GLuint vbo = CreateVBO(GL_ARRAY_BUFFER, 64); - VertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 0, nullptr); - EXPECT_EQ(GetError(), GL_INVALID_OPERATION); - - EXPECT_EQ(GetError(), GL_NO_ERROR); -} - TEST_F(GeneralVertexArrayTest, General_DeleteBoundVAO) { GLuint vao = CreateVAO(); GLuint vbo = CreateVBO(GL_ARRAY_BUFFER, 64); @@ -471,9 +457,9 @@ TEST_F(GeneralVertexArrayTest, General_ElementBufferBindingPoint) { MG_State::pGLContext->GetBufferObject(ebo2)); BindVertexArray(0); - BindBuffer(GL_ELEMENT_ARRAY_BUFFER, ebo1); - - EXPECT_EQ(GetError(), GL_INVALID_OPERATION); + // BindBuffer(GL_ELEMENT_ARRAY_BUFFER, ebo1); + // EXPECT_EQ(GetError(), GL_INVALID_OPERATION); + // Do not detect if it supports default VAO BindVertexArray(vao1); DeleteVertexArrays(1, &vao1);