From 3499639d62e5b75eebb1b86cca07e977f2dcb8b2 Mon Sep 17 00:00:00 2001 From: David Steele Date: Thu, 27 Apr 2023 12:11:01 +0100 Subject: [PATCH] Test sync with adaptor Adaptor changes for integer attribute Change-Id: I89471ca98179d1ca9a9e19db6110585d7231378a --- .../dali-toolkit-test-utils/test-actor-utils.cpp | 9 +++++++- .../dali-toolkit-test-utils/test-actor-utils.h | 5 ++-- .../test-gl-abstraction.cpp | 8 +++---- .../dali-toolkit-test-utils/test-gl-abstraction.h | 27 +++++++++++++++++----- 4 files changed, 36 insertions(+), 13 deletions(-) diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-actor-utils.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-actor-utils.cpp index bf62bb8..40388b3 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-actor-utils.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-actor-utils.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Samsung Electronics Co., Ltd. + * Copyright (c) 2023 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -131,4 +131,11 @@ Texture CreateTexture(TextureType::Type type, Pixel::Format format, int width, i return texture; } +TextureSet CreateTextureSet(Pixel::Format format, int width, int height) +{ + TextureSet textureSet = TextureSet::New(); + textureSet.SetTexture(0u, CreateTexture(TextureType::TEXTURE_2D, format, width, height)); + return textureSet; +} + } // namespace Dali diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-actor-utils.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-actor-utils.h index 0dbe07e..94f1493 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-actor-utils.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-actor-utils.h @@ -2,7 +2,7 @@ #define DALI_TEST_ACTOR_UTILS_H /* - * Copyright (c) 2021 Samsung Electronics Co., Ltd. + * Copyright (c) 2023 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -60,7 +60,8 @@ Actor CreateRenderableActor(Texture texture, const std::string& vertexShader, co */ Actor CreateRenderableActor2(TextureSet textures, const std::string& vertexShader, const std::string& fragmentShader); -Texture CreateTexture(TextureType::Type type, Pixel::Format format, int width, int height); +Texture CreateTexture(TextureType::Type type, Pixel::Format format, int width, int height); +TextureSet CreateTextureSet(Pixel::Format format, int width, int height); } // namespace Dali diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-abstraction.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-abstraction.cpp index 6021026..1d20a6a 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-abstraction.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-abstraction.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Samsung Electronics Co., Ltd. + * Copyright (c) 2023 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -101,9 +101,9 @@ void TestGlAbstraction::Initialize() mProgramUniforms3f.clear(); mProgramUniforms4f.clear(); - mAttribLocs.clear(); - mAttribLocs.push_back("aPosition"); - mAttribLocs.push_back("aTexCoord"); + mAttribLocs = {"aPosition", "aTexCoord"}; + mAttribTypes = {GL_FLOAT, GL_FLOAT}; + mCullFaceTrace.Reset(); mDepthFunctionTrace.Reset(); mEnableDisableTrace.Reset(); diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-abstraction.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-abstraction.h index 834ae6f..cc27d9e 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-abstraction.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-abstraction.h @@ -796,6 +796,8 @@ public: inline void GetActiveAttrib(GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, char* name) override { + strncpy(name, mAttribLocs[index].c_str(), 99); + *type = mAttribTypes[index]; } inline void SetActiveUniforms(const std::vector& uniforms) @@ -1590,6 +1592,18 @@ public: mBufferTrace.PushCall("VertexAttribPointer", namedParams.str(), namedParams); } + inline void VertexAttribIPointer(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid* pointer) override + { + TraceCallStack::NamedParams namedParams; + namedParams["index"] << index; + namedParams["size"] << size; + namedParams["type"] << std::hex << type; + namedParams["stride"] << stride; + namedParams["offset"] << std::to_string(reinterpret_cast(pointer)); + + mBufferTrace.PushCall("VertexAttribIPointer", namedParams.str(), namedParams); + } + inline void Viewport(GLint x, GLint y, GLsizei width, GLsizei height) override { std::string commaString(", "); @@ -1772,10 +1786,6 @@ public: { } - inline void VertexAttribIPointer(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid* pointer) override - { - } - inline void GetVertexAttribIiv(GLuint index, GLenum pname, GLint* params) override { } @@ -2099,10 +2109,14 @@ public: // TEST FUNCTIONS { mLinkStatus = value; } - inline void SetAttribLocations(std::vector locs) + inline void SetAttribLocations(std::vector& locs) { mAttribLocs = locs; } + inline void SetAttribTypes(std::vector& types) + { + mAttribTypes = types; + } inline void SetGetErrorResult(GLenum result) { mGetErrorResult = result; @@ -2573,7 +2587,8 @@ public: bool mGetProgramBinaryCalled; typedef std::map ShaderSourceMap; ShaderSourceMap mShaderSources; - std::vector mAttribLocs; // should be bound to shader + std::vector mAttribLocs; // should be bound to shader + std::vector mAttribTypes; // should be bound to shader GLuint mLastShaderCompiled; GLbitfield mLastClearBitMask; Vector4 mLastClearColor; -- 2.7.4