swung0x48/MobileGL
1
0
Fork 0
mirror of https://github.com/MobileGL-Dev/MobileGL synced 2026-09-12 22:28:32 +09:00
Code Issues Packages Projects Releases Wiki Activity

[Fix] (MG_Test/VertexArrayTest): Fix incorrect check in General_BindWithoutCreation.

Browse Source
This commit is contained in:
BZLZHH
2025-10-02 14:39:49 +08:00
parent 000a2ba3a7
commit 14415d42a9
1 changed files with 17 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MobileGL/MG_Test/VertexArray/VertexArrayTest.cpp
+7 -12
View File
@@ -16,10 +16,7 @@ protected:
auto vbo = glContext.CreateBufferObject(bufferNames[0]); auto vbo = glContext.CreateBufferObject(bufferNames[0]);
glContext.GetBufferBindingSlot(BufferTarget::Vertex).Bind(vbo); glContext.GetBufferBindingSlot(BufferTarget::Vertex).Bind(vbo);
Vector<float> vertexData = { Vector<float> vertexData = {0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 0.0f, 0.0f, 1.0f};
0.0f, 0.0f, 0.0f, 1.0f,
1.0f, 0.0f, 0.0f, 1.0f
};
SizeT byteSize = vertexData.size() * sizeof(float); SizeT byteSize = vertexData.size() * sizeof(float);
vbo->Resize(byteSize); vbo->Resize(byteSize);
DataPtr ptr{.data = vertexData.data(), .size = byteSize}; DataPtr ptr{.data = vertexData.data(), .size = byteSize};
@@ -202,14 +199,11 @@ TEST_F(VertexArrayTest, BoundVAOPreservesState) {
ASSERT_FALSE(vao2->IsAttributeEnabled(0)); ASSERT_FALSE(vao2->IsAttributeEnabled(0));
} }
using namespace MobileGL::MG_Impl::GLImpl; using namespace MobileGL::MG_Impl::GLImpl;
class GeneralVertexArrayTest : public ::testing::Test { class GeneralVertexArrayTest : public ::testing::Test {
protected: protected:
void SetUp() override { void SetUp() override { MG_State::pGLContext = new MG_State::GLState::GLContext(); }
MG_State::pGLContext = new MG_State::GLState::GLContext();
}
void TearDown() override { void TearDown() override {
delete MG_State::pGLContext; delete MG_State::pGLContext;
@@ -296,7 +290,8 @@ TEST_F(GeneralVertexArrayTest, General_IndexBufferBinding) {
GenBuffers(1, &newEbo); GenBuffers(1, &newEbo);
BindBuffer(GL_ELEMENT_ARRAY_BUFFER, newEbo); BindBuffer(GL_ELEMENT_ARRAY_BUFFER, newEbo);
EXPECT_EQ(MG_State::pGLContext->GetBufferBindingSlot(BufferTarget::Index).GetBoundObject(), MG_State::pGLContext->GetBufferObject(newEbo)); EXPECT_EQ(MG_State::pGLContext->GetBufferBindingSlot(BufferTarget::Index).GetBoundObject(),
MG_State::pGLContext->GetBufferObject(newEbo));
EXPECT_EQ(GetError(), GL_NO_ERROR); EXPECT_EQ(GetError(), GL_NO_ERROR);
} }
@@ -415,13 +410,13 @@ TEST_F(GeneralVertexArrayTest, General_BindWithoutCreation) {
GLuint vao = 1; GLuint vao = 1;
BindVertexArray(vao); BindVertexArray(vao);
EXPECT_EQ(GetError(), GL_NO_ERROR); EXPECT_EQ(GetError(), GL_INVALID_OPERATION);
EXPECT_NE(MG_State::pGLContext->GetVertexArrayObject(vao), nullptr); EXPECT_EQ(MG_State::pGLContext->GetVertexArrayObject(vao), nullptr);
GLuint vbo = CreateVBO(GL_ARRAY_BUFFER, 64); GLuint vbo = CreateVBO(GL_ARRAY_BUFFER, 64);
VertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 0, nullptr); VertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 0, nullptr);
EXPECT_EQ(GetError(), GL_NO_ERROR); EXPECT_EQ(GetError(), GL_INVALID_OPERATION);
EXPECT_EQ(GetError(), GL_NO_ERROR); EXPECT_EQ(GetError(), GL_NO_ERROR);
} }