From c00a90277673c98f16807dac6d48bda343c93cde Mon Sep 17 00:00:00 2001
From: David Steele <david.steele@samsung.com>
Date: Mon, 5 Feb 2024 16:55:47 +0000
Subject: [PATCH] Remove inclusion of gl-abstraction.h

Remove all #includes.

Would like to move this abstraction to dali-adaptor, but many tests use the test-gl-abstraction
layer to check that e.g. uniforms have been written. Instead, they should be modified to use the
test graphics layer, but that's a lot of work :/.

So, have just removed the usage, but left the file there.

Change-Id: I16f4945eb54ede451f4c91ee130284e84d653309
Signed-off-by: David Steele <david.steele@samsung.com>
---
 dali/graphics-api/graphics-controller.h             | 5 -----
 dali/integration-api/bitmap.cpp                     | 3 +--
 dali/integration-api/core.h                         | 5 ++---
 dali/internal/common/core-impl.cpp                  | 1 -
 dali/internal/common/core-impl.h                    | 1 -
 dali/internal/event/common/thread-local-storage.cpp | 1 -
 6 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/dali/graphics-api/graphics-controller.h b/dali/graphics-api/graphics-controller.h
index 99edd0e..0ca8bf5 100644
--- a/dali/graphics-api/graphics-controller.h
+++ b/dali/graphics-api/graphics-controller.h
@@ -41,11 +41,6 @@
 
 namespace Dali
 {
-namespace Integration
-{
-class GlAbstraction;
-} // namespace Integration
-
 namespace Graphics
 {
 class Command;
diff --git a/dali/integration-api/bitmap.cpp b/dali/integration-api/bitmap.cpp
index 70db04b..bab8f5a 100644
--- a/dali/integration-api/bitmap.cpp
+++ b/dali/integration-api/bitmap.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 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.
@@ -20,7 +20,6 @@
 
 // INTERNAL INCLUDES
 #include <dali/integration-api/debug.h>
-#include <dali/integration-api/gl-abstraction.h>
 #include <dali/integration-api/gl-defines.h>
 #include <dali/integration-api/platform-abstraction.h>
 #include <dali/internal/event/common/thread-local-storage.h>
diff --git a/dali/integration-api/core.h b/dali/integration-api/core.h
index c8d2a61..e297bce 100644
--- a/dali/integration-api/core.h
+++ b/dali/integration-api/core.h
@@ -2,7 +2,7 @@
 #define DALI_INTEGRATION_CORE_H
 
 /*
- * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 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.
@@ -182,7 +182,7 @@ private:
  * Integration::Core is used for integration with the native windowing system.
  * The following integration tasks must be completed:
  *
- * 1) Handle GL context creation, and notify the Core when this occurs.
+ * 1) Handle Graphics context creation, and notify the Core when this occurs.
  *
  * 2) Provide suspend/resume behaviour (see below for more details).
  *
@@ -194,7 +194,6 @@ private:
  *
  * 5) Provide an implementation of the PlatformAbstraction interface, used to access platform specific services.
  *
- * 6) Provide an implementation of the GlAbstraction interface, used to access OpenGL services.
  *
  * Multi-threading notes:
  *
diff --git a/dali/internal/common/core-impl.cpp b/dali/internal/common/core-impl.cpp
index 936ba76..461d2eb 100644
--- a/dali/internal/common/core-impl.cpp
+++ b/dali/internal/common/core-impl.cpp
@@ -70,7 +70,6 @@ namespace Dali
 namespace Internal
 {
 using Integration::Event;
-using Integration::GlAbstraction;
 using Integration::PlatformAbstraction;
 using Integration::RenderController;
 using Integration::RenderStatus;
diff --git a/dali/internal/common/core-impl.h b/dali/internal/common/core-impl.h
index 61fe6f1..e7a2a86 100644
--- a/dali/internal/common/core-impl.h
+++ b/dali/internal/common/core-impl.h
@@ -41,7 +41,6 @@ namespace Integration
 {
 class Processor;
 class RenderController;
-class GlAbstraction;
 class PlatformAbstraction;
 class UpdateStatus;
 class RenderStatus;
diff --git a/dali/internal/event/common/thread-local-storage.cpp b/dali/internal/event/common/thread-local-storage.cpp
index 8cac030..2cbab57 100644
--- a/dali/internal/event/common/thread-local-storage.cpp
+++ b/dali/internal/event/common/thread-local-storage.cpp
@@ -19,7 +19,6 @@
 #include <dali/internal/event/common/thread-local-storage.h>
 
 // INTERNAL INCLUDES
-#include <dali/integration-api/gl-abstraction.h>
 #include <dali/integration-api/processor-interface.h>
 #include <dali/internal/common/core-impl.h>
 #include <dali/internal/event/common/event-thread-services.h>
-- 
2.7.4