swung0x48/MobileGL
1
0
Fork 0
mirror of https://github.com/MobileGL-Dev/MobileGL synced 2026-09-11 21:58:31 +09:00
Code Issues Packages Projects Releases Wiki Activity

[Fix] (MG_Test/VertexArrayTest): fix VertexArrayTest compilation error

Browse Source
This commit is contained in:
swung0x48
2026-03-18 13:07:57 +08:00
parent 1e11a5950e
commit 2ecba4d70c
1 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MobileGL/MG_Test/VertexArray/VertexArrayTest.cpp
+23 -14
View File
@@ -21,7 +21,8 @@ using namespace MobileGL;
class VertexArrayTest : public ::testing::Test { class VertexArrayTest : public ::testing::Test {
protected: protected:
SharedPtr<MG_State::GLState::BufferObject> CreateTestVBO() { SharedPtr<MG_State::GLState::BufferObject> CreateTestVBO() {
auto bufferNames = MobileGL::MG_State::pGLContext->GenBufferNames(1); Vector<Uint> bufferNames;
MobileGL::MG_State::pGLContext->GenBufferNames(1, bufferNames);
auto vbo = MobileGL::MG_State::pGLContext->CreateBufferObject(bufferNames[0]); auto vbo = MobileGL::MG_State::pGLContext->CreateBufferObject(bufferNames[0]);
MobileGL::MG_State::pGLContext->GetBufferBindingSlot(BufferTarget::Vertex).Bind(vbo); MobileGL::MG_State::pGLContext->GetBufferBindingSlot(BufferTarget::Vertex).Bind(vbo);
@@ -39,7 +40,8 @@ protected:
}; };
TEST_F(VertexArrayTest, GenerateAndBindVAO) { TEST_F(VertexArrayTest, GenerateAndBindVAO) {
auto vaoNames = MobileGL::MG_State::pGLContext->GenVertexArrayNames(2); Vector<Uint> vaoNames;
MobileGL::MG_State::pGLContext->GenVertexArrayNames(2, vaoNames);
auto vao0 = MobileGL::MG_State::pGLContext->CreateVertexArrayObject(vaoNames[0]); auto vao0 = MobileGL::MG_State::pGLContext->CreateVertexArrayObject(vaoNames[0]);
auto vao1 = MobileGL::MG_State::pGLContext->CreateVertexArrayObject(vaoNames[1]); auto vao1 = MobileGL::MG_State::pGLContext->CreateVertexArrayObject(vaoNames[1]);
@@ -55,7 +57,8 @@ TEST_F(VertexArrayTest, GenerateAndBindVAO) {
} }
TEST_F(VertexArrayTest, VertexAttributeSetup) { TEST_F(VertexArrayTest, VertexAttributeSetup) {
auto vaoNames = MobileGL::MG_State::pGLContext->GenVertexArrayNames(1); Vector<Uint> vaoNames;
MobileGL::MG_State::pGLContext->GenVertexArrayNames(1, vaoNames);
auto vao = MobileGL::MG_State::pGLContext->CreateVertexArrayObject(vaoNames[0]); auto vao = MobileGL::MG_State::pGLContext->CreateVertexArrayObject(vaoNames[0]);
MobileGL::MG_State::pGLContext->BindVertexArray(vaoNames[0]); MobileGL::MG_State::pGLContext->BindVertexArray(vaoNames[0]);
@@ -86,11 +89,13 @@ TEST_F(VertexArrayTest, VertexAttributeSetup) {
} }
TEST_F(VertexArrayTest, IndexBufferBinding) { TEST_F(VertexArrayTest, IndexBufferBinding) {
auto vaoNames = MobileGL::MG_State::pGLContext->GenVertexArrayNames(1); Vector<Uint> vaoNames;
MobileGL::MG_State::pGLContext->GenVertexArrayNames(1, vaoNames);
auto vao = MobileGL::MG_State::pGLContext->CreateVertexArrayObject(vaoNames[0]); auto vao = MobileGL::MG_State::pGLContext->CreateVertexArrayObject(vaoNames[0]);
MobileGL::MG_State::pGLContext->BindVertexArray(vaoNames[0]); MobileGL::MG_State::pGLContext->BindVertexArray(vaoNames[0]);
auto bufferNames = MobileGL::MG_State::pGLContext->GenBufferNames(1); Vector<Uint> bufferNames;
MobileGL::MG_State::pGLContext->GenBufferNames(1, bufferNames);
auto ebo = MobileGL::MG_State::pGLContext->CreateBufferObject(bufferNames[0]); auto ebo = MobileGL::MG_State::pGLContext->CreateBufferObject(bufferNames[0]);
MobileGL::MG_State::pGLContext->GetBufferBindingSlot(BufferTarget::Index).Bind(ebo); MobileGL::MG_State::pGLContext->GetBufferBindingSlot(BufferTarget::Index).Bind(ebo);
@@ -103,14 +108,16 @@ TEST_F(VertexArrayTest, IndexBufferBinding) {
MobileGL::MG_State::pGLContext->GetBufferBindingSlot(BufferTarget::Index).Bind(ebo); MobileGL::MG_State::pGLContext->GetBufferBindingSlot(BufferTarget::Index).Bind(ebo);
ASSERT_EQ(MobileGL::MG_State::pGLContext->GetBufferBindingSlot(BufferTarget::Index).GetBoundObject(), ebo); ASSERT_EQ(MobileGL::MG_State::pGLContext->GetBufferBindingSlot(BufferTarget::Index).GetBoundObject(), ebo);
auto newEboNames = MobileGL::MG_State::pGLContext->GenBufferNames(1); Vector<Uint> newEboNames;
MobileGL::MG_State::pGLContext->GenBufferNames(1, newEboNames);
auto newEbo = MobileGL::MG_State::pGLContext->CreateBufferObject(newEboNames[0]); auto newEbo = MobileGL::MG_State::pGLContext->CreateBufferObject(newEboNames[0]);
MobileGL::MG_State::pGLContext->GetBufferBindingSlot(BufferTarget::Index).Bind(newEbo); MobileGL::MG_State::pGLContext->GetBufferBindingSlot(BufferTarget::Index).Bind(newEbo);
ASSERT_EQ(MobileGL::MG_State::pGLContext->GetBufferBindingSlot(BufferTarget::Index).GetBoundObject(), newEbo); ASSERT_EQ(MobileGL::MG_State::pGLContext->GetBufferBindingSlot(BufferTarget::Index).GetBoundObject(), newEbo);
} }
TEST_F(VertexArrayTest, DeleteVAO) { TEST_F(VertexArrayTest, DeleteVAO) {
auto vaoNames = MobileGL::MG_State::pGLContext->GenVertexArrayNames(1); Vector<Uint> vaoNames;
MobileGL::MG_State::pGLContext->GenVertexArrayNames(1, vaoNames);
auto vao = MobileGL::MG_State::pGLContext->CreateVertexArrayObject(vaoNames[0]); auto vao = MobileGL::MG_State::pGLContext->CreateVertexArrayObject(vaoNames[0]);
MobileGL::MG_State::pGLContext->BindVertexArray(vaoNames[0]); MobileGL::MG_State::pGLContext->BindVertexArray(vaoNames[0]);
@@ -125,7 +132,8 @@ TEST_F(VertexArrayTest, DeleteVAO) {
TEST_F(VertexArrayTest, ValidateNamesAndObjects) { TEST_F(VertexArrayTest, ValidateNamesAndObjects) {
const Uint count = 5; const Uint count = 5;
auto vaoNames = MobileGL::MG_State::pGLContext->GenVertexArrayNames(count); Vector<Uint> vaoNames;
MobileGL::MG_State::pGLContext->GenVertexArrayNames(count, vaoNames);
for (Uint i = 0; i < count; i++) { for (Uint i = 0; i < count; i++) {
ASSERT_TRUE(MobileGL::MG_State::pGLContext->ValidateVertexArrayName(vaoNames[i])); ASSERT_TRUE(MobileGL::MG_State::pGLContext->ValidateVertexArrayName(vaoNames[i]));
@@ -144,12 +152,14 @@ TEST_F(VertexArrayTest, ValidateNamesAndObjects) {
} }
TEST_F(VertexArrayTest, MultipleAttributes) { TEST_F(VertexArrayTest, MultipleAttributes) {
auto vaoNames = MobileGL::MG_State::pGLContext->GenVertexArrayNames(1); Vector<Uint> vaoNames;
MobileGL::MG_State::pGLContext->GenVertexArrayNames(1, vaoNames);
auto vao = MobileGL::MG_State::pGLContext->CreateVertexArrayObject(vaoNames[0]); auto vao = MobileGL::MG_State::pGLContext->CreateVertexArrayObject(vaoNames[0]);
MobileGL::MG_State::pGLContext->BindVertexArray(vaoNames[0]); MobileGL::MG_State::pGLContext->BindVertexArray(vaoNames[0]);
auto vboPos = CreateTestVBO(); auto vboPos = CreateTestVBO();
auto vboNormalNames = MobileGL::MG_State::pGLContext->GenBufferNames(1); Vector<Uint> vboNormalNames;
MobileGL::MG_State::pGLContext->GenBufferNames(1, vboNormalNames);
auto vboNormal = MobileGL::MG_State::pGLContext->CreateBufferObject(vboNormalNames[0]); auto vboNormal = MobileGL::MG_State::pGLContext->CreateBufferObject(vboNormalNames[0]);
Vector<float> normals(12, 0.5f); Vector<float> normals(12, 0.5f);
@@ -187,7 +197,8 @@ TEST_F(VertexArrayTest, MultipleAttributes) {
} }
TEST_F(VertexArrayTest, BoundVAOPreservesState) { TEST_F(VertexArrayTest, BoundVAOPreservesState) {
auto vaoNames = MobileGL::MG_State::pGLContext->GenVertexArrayNames(2); Vector<Uint> vaoNames;
MobileGL::MG_State::pGLContext->GenVertexArrayNames(2, vaoNames);
auto vao1 = MobileGL::MG_State::pGLContext->CreateVertexArrayObject(vaoNames[0]); auto vao1 = MobileGL::MG_State::pGLContext->CreateVertexArrayObject(vaoNames[0]);
auto vao2 = MobileGL::MG_State::pGLContext->CreateVertexArrayObject(vaoNames[1]); auto vao2 = MobileGL::MG_State::pGLContext->CreateVertexArrayObject(vaoNames[1]);
@@ -216,11 +227,9 @@ using namespace MobileGL::MG_Impl::GLImpl;
class GeneralVertexArrayTest : public ::testing::Test { class GeneralVertexArrayTest : public ::testing::Test {
protected: protected:
void SetUp() override { MG_State::pGLContext = new MG_State::GLState::GLContext(); } void SetUp() override { MG_State::pGLContext = MakeUnique<MG_State::GLState::GLContext>(); }
void TearDown() override { void TearDown() override {
delete MG_State::pGLContext;
MG_State::pGLContext = nullptr;
} }
GLuint CreateVAO() { GLuint CreateVAO() {