*/
#include "test-gl-abstraction.h"
+#include "test-trace-call-stack.h"
namespace Dali
{
TestGlAbstraction::TestGlAbstraction()
-: mBufferTrace(true, "gl"),
- mTextureTrace(true, "gl"),
+: mBufferTrace(true, std::string("gl")),
+ mCullFaceTrace(true, "gl"),
+ mEnableDisableTrace(true, "gl"),
+ mShaderTrace(true, "gl"),
+ mTextureTrace(true, std::string("gl")),
mTexParameterTrace(true, "gl"),
- mDrawTrace(true, "gl")
+ mDrawTrace(true, "gl"),
+ mDepthFunctionTrace(true, "gl"),
+ mStencilFunctionTrace(true, "gl"),
+ mScissorTrace(true, "gl"),
+ mSetUniformTrace(true, "Uniform "),
+ mViewportTrace(true, "gl")
{
Initialize();
}
}
std::stringstream out;
- out << target << ", " << texture;
+ out << std::hex << target << ", " << std::dec << texture;
TraceCallStack::NamedParams namedParams;
- namedParams["target"] << target;
+ namedParams["target"] << std::hex << target;
namedParams["texture"] << texture;
mTextureTrace.PushCall("BindTexture", out.str(), namedParams);
case GL_ACTIVE_UNIFORM_MAX_LENGTH:
*params = 100;
break;
+ case GL_ACTIVE_ATTRIBUTE_MAX_LENGTH:
+ *params = 100;
+ break;
}
}
inline GLboolean UnmapBuffer(GLenum target) override
{
- return false;
+ if(mMappedBuffer)
+ {
+ free(mMappedBuffer);
+ mMappedBuffer = nullptr;
+ }
+ return true; // false indicates corruption, nothing else.
}
inline void GetBufferPointerv(GLenum target, GLenum pname, GLvoid** params) override
inline GLvoid* MapBufferRange(GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access) override
{
- return NULL;
+ mMappedBuffer = reinterpret_cast<GLvoid*>(malloc(offset + length));
+ return mMappedBuffer;
}
inline void FlushMappedBufferRange(GLenum target, GLintptr offset, GLsizeiptr length) override
GLuint mCompileStatus;
BufferDataCalls mBufferDataCalls;
BufferSubDataCalls mBufferSubDataCalls;
+ GLvoid* mMappedBuffer{nullptr};
GLuint mLinkStatus;
GLint mNumberOfActiveUniforms;
GLenum mGetErrorResult;
#define TEST_GL_SYNC_ABSTRACTION_H
/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2021 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.
typedef std::vector<TestSyncObject*> SyncContainer;
typedef SyncContainer::iterator SyncIter;
- SyncContainer mSyncObjects; ///< The sync objects
- TraceCallStack mTrace; ///< the trace call stack for testing
+ SyncContainer mSyncObjects; ///< The sync objects
+ TraceCallStack mTrace{true, "gl"}; ///< the trace call stack for testing
};
} // namespace Dali
mExtensionCreateCalls(0),
mExtensionDestroyCalls(0),
mTargetTextureCalls(0),
- createResult(true)
+ createResult(true),
+ mCallStack(true, "NativeImage::")
{
mCallStack.EnableLogging(true);
}
int32_t mTargetTextureCalls;
uint32_t mTargetTextureError{0u};
bool createResult;
- mutable TraceCallStack mCallStack{"NativeImage:"};
+ mutable TraceCallStack mCallStack;
};
} // namespace Dali
/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2021 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.
namespace Dali
{
TestPlatformAbstraction::TestPlatformAbstraction()
-: mTrace(),
- mIsLoadingResult(false),
+: mIsLoadingResult(false),
mClosestSize(),
mLoadFileResult(),
mSaveFileResult(false),
#define DALI_TEST_PLATFORM_ABSTRACTION_H
/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2021 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.
Dali::Vector<unsigned char> buffer;
};
- mutable TraceCallStack mTrace;
+ mutable TraceCallStack mTrace{true, "PlatformAbstraction::"};
bool mIsLoadingResult;
ImageDimensions mClosestSize;
/**
* Constructor
*/
-TraceCallStack::TraceCallStack(std::string prefix)
-: mTraceActive(false),
- mLogging(false),
- mPrefix(prefix)
-{
-}
-
TraceCallStack::TraceCallStack(bool logging, std::string prefix)
: mTraceActive(false),
mLogging(logging),
/**
* Constructor
*/
- TraceCallStack(std::string prefix = "gl");
- TraceCallStack(bool logging, std::string prefix = "gl");
+ TraceCallStack(bool logging, std::string prefix);
+
+ TraceCallStack(const TraceCallStack&) = delete;
+ TraceCallStack(TraceCallStack&&) = delete;
/**
* Destructor
application.ProcessEvent(touchEvent);
- glAbstraction.ResetSetUniformCallStack();
- glSetUniformStack = glAbstraction.GetSetUniformTrace();
+ glSetUniformStack.Reset();
application.SendNotification();
application.Render();
application.ProcessEvent(touchEvent);
- glAbstraction.ResetSetUniformCallStack();
- glSetUniformStack = glAbstraction.GetSetUniformTrace();
+ glSetUniformStack.Reset();
application.SendNotification();
application.Render();
application.ProcessEvent(touchEvent);
- glAbstraction.ResetSetUniformCallStack();
- glSetUniformStack = glAbstraction.GetSetUniformTrace();
+ glSetUniformStack.Reset();
application.SendNotification();
application.Render();
application.SendNotification();
application.Render();
- glSetUniformStack = glAbstraction.GetSetUniformTrace();
-
tet_printf("Trace:%s \n", glSetUniformStack.GetTraceString().c_str());
// Test order of uniforms in stack
application.ProcessEvent(touchEvent); // touch event
- glAbstraction.ResetSetUniformCallStack();
- glSetUniformStack = glAbstraction.GetSetUniformTrace();
+ glSetUniformStack.Reset();
application.SendNotification();
application.Render();
application.ProcessEvent(touchEvent);
- glAbstraction.ResetSetUniformCallStack();
- glSetUniformStack = glAbstraction.GetSetUniformTrace();
+ glSetUniformStack.Reset();
application.Render();
tet_printf("Trace:%s \n", glSetUniformStack.GetTraceString().c_str());
application.ProcessEvent(touchEvent);
- glAbstraction.ResetSetUniformCallStack();
- glSetUniformStack = glAbstraction.GetSetUniformTrace();
+ glSetUniformStack.Reset();
application.Render();
tet_printf("Trace:%s \n", glSetUniformStack.GetTraceString().c_str());
application.SendNotification();
application.Render();
- glSetUniformStack = glAbstraction.GetSetUniformTrace();
-
tet_printf("Trace:%s \n", glSetUniformStack.GetTraceString().c_str());
// Test order of uniforms in stack
application.ProcessEvent(touchEvent); // touch event
- glAbstraction.ResetSetUniformCallStack();
- glSetUniformStack = glAbstraction.GetSetUniformTrace();
+ glSetUniformStack.Reset();
application.SendNotification();
application.Render();
application.ProcessEvent(touchEvent);
- glAbstraction.ResetSetUniformCallStack();
- glSetUniformStack = glAbstraction.GetSetUniformTrace();
+ glSetUniformStack.Reset();
application.Render();
tet_printf("Trace:%s \n", glSetUniformStack.GetTraceString().c_str());
application.ProcessEvent(touchEvent);
- glAbstraction.ResetSetUniformCallStack();
- glSetUniformStack = glAbstraction.GetSetUniformTrace();
+ glSetUniformStack.Reset();
application.Render();
tet_printf("Trace:%s \n", glSetUniformStack.GetTraceString().c_str());
for(unsigned int i(0); i < 4; ++i)
{
std::stringstream params;
- params << GL_TEXTURE_2D << ", " << i + 1;
+ params << std::hex << GL_TEXTURE_2D << std::dec << ", " << i + 1;
textureBindIndex[i] = gl.GetTextureTrace().FindIndexFromMethodAndParams("BindTexture", params.str());
}
for(unsigned int i(0); i < 6; ++i)
{
std::stringstream params;
- params << GL_TEXTURE_2D << ", " << i + 1;
+ params << std::hex << GL_TEXTURE_2D << std::dec << ", " << i + 1;
textureBindIndex[i] = gl.GetTextureTrace().FindIndexFromMethodAndParams("BindTexture", params.str());
}
for(unsigned int i(0); i < 6; ++i)
{
std::stringstream params;
- params << GL_TEXTURE_2D << ", " << i + 1;
+ params << std::hex << GL_TEXTURE_2D << std::dec << ", " << i + 1;
textureBindIndex[i] = gl.GetTextureTrace().FindIndexFromMethodAndParams("BindTexture", params.str());
}
for(unsigned int i(0); i < 6; ++i)
{
std::stringstream params;
- params << GL_TEXTURE_2D << ", " << i + 1;
+ params << std::hex << GL_TEXTURE_2D << std::dec << ", " << i + 1;
textureBindIndex[i] = gl.GetTextureTrace().FindIndexFromMethodAndParams("BindTexture", params.str());
}
for(unsigned int i(0); i < 5; ++i)
{
std::stringstream params;
- params << GL_TEXTURE_2D << ", " << i + 1;
+ params << std::hex << GL_TEXTURE_2D << std::dec << ", " << i + 1;
textureBindIndex[i] = gl.GetTextureTrace().FindIndexFromMethodAndParams("BindTexture", params.str());
}