Automated Tests Sync

Change-Id: Id67435bb5de6e169efbfbe4650c6d5a4b7a06647

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 098f555..9f458fc 100644 (file)
--- 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
@@ -2,7 +2,7 @@
 #define TEST_GL_ABSTRACTION_H
 
 /*
 #define TEST_GL_ABSTRACTION_H
 
 /*

- * Copyright (c) 2019 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.


@@ -29,6 +29,7 @@
 
 // INTERNAL INCLUDES
 #include <dali/public-api/dali-core.h>
 
 // INTERNAL INCLUDES
 #include <dali/public-api/dali-core.h>

+#include <dali/devel-api/rendering/frame-buffer-devel.h>

 #include <dali/integration-api/core.h>
 #include <dali/integration-api/gl-abstraction.h>
 #include <dali/integration-api/gl-defines.h>
 #include <dali/integration-api/core.h>
 #include <dali/integration-api/gl-abstraction.h>
 #include <dali/integration-api/gl-defines.h>


@@ -584,7 +585,7 @@ public:
     mFramebufferStatus |= 4;
 
     //We check 4 attachment colors
     mFramebufferStatus |= 4;
 
     //We check 4 attachment colors

-    if ((attachment >= GL_COLOR_ATTACHMENT0) && (attachment < GL_COLOR_ATTACHMENT0 + Dali::FrameBuffer::MAX_COLOR_ATTACHMENTS))
+    if ((attachment >= GL_COLOR_ATTACHMENT0) && (attachment < GL_COLOR_ATTACHMENT0 + Dali::DevelFrameBuffer::MAX_COLOR_ATTACHMENTS))

     {
       uint8_t mask = 1 << (attachment - GL_COLOR_ATTACHMENT0);
       if ((mFrameBufferColorStatus & mask) == 0)
     {
       uint8_t mask = 1 << (attachment - GL_COLOR_ATTACHMENT0);
       if ((mFrameBufferColorStatus & mask) == 0)