From 386e87ecf4114084c10dd385edc1c2baebe80a04 Mon Sep 17 00:00:00 2001
From: Jean-Luc Brouillet <jeanluc@google.com>
Date: Sun, 22 Mar 2015 12:44:27 -0700
Subject: Reorganize the header files in a way that's easier to document.

This CL does not change any specification found in a .spec file,
it just reorganizes the distribution of the content.

It also changes a few files that included headers that no longer
exist.

Change-Id: I9474ea6706449312fc7a5715d5bef3eabb288bb9
---
 driver/runtime/arch/clamp.c   | 3 +--
 driver/runtime/arch/generic.c | 2 +-
 driver/runtime/rs_cl.c        | 2 +-
 driver/runtime/rs_core.c      | 1 -
 driver/runtime/rs_structs.h   | 3 +++
 5 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'driver')

diff --git a/driver/runtime/arch/clamp.c b/driver/runtime/arch/clamp.c
index fc8f248e..86d6f96f 100644
--- a/driver/runtime/arch/clamp.c
+++ b/driver/runtime/arch/clamp.c
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "rs_types.rsh"
+#include "rs_core.rsh"
 
 typedef unsigned long long ull;
 typedef unsigned long long ull2 __attribute__((ext_vector_type(2)));
@@ -106,4 +106,3 @@ V_CLAMP(ulong);
 V_CLAMP(ull);
 
 #undef _CLAMP
-
diff --git a/driver/runtime/arch/generic.c b/driver/runtime/arch/generic.c
index c7a717f2..e178ed58 100644
--- a/driver/runtime/arch/generic.c
+++ b/driver/runtime/arch/generic.c
@@ -15,7 +15,7 @@
  */
 
 
-#include "rs_types.rsh"
+#include "rs_core.rsh"
 
 extern short __attribute__((overloadable, always_inline)) rsClamp(short amount, short low, short high);
 extern uchar4 __attribute__((overloadable)) convert_uchar4(short4);
diff --git a/driver/runtime/rs_cl.c b/driver/runtime/rs_cl.c
index a79ad2a9..3296eede 100644
--- a/driver/runtime/rs_cl.c
+++ b/driver/runtime/rs_cl.c
@@ -1,4 +1,4 @@
-#include "rs_types.rsh"
+#include "rs_core.rsh"
 
 extern float2 __attribute__((overloadable)) convert_float2(int2 c);
 extern float3 __attribute__((overloadable)) convert_float3(int3 c);
diff --git a/driver/runtime/rs_core.c b/driver/runtime/rs_core.c
index 856c42bf..bd0b2a1e 100644
--- a/driver/runtime/rs_core.c
+++ b/driver/runtime/rs_core.c
@@ -1,5 +1,4 @@
 #include "rs_core.rsh"
-#include "rs_types.rsh"
 #include "rs_structs.h"
 
 #include "rsCpuCoreRuntime.h"
diff --git a/driver/runtime/rs_structs.h b/driver/runtime/rs_structs.h
index 76c21564..2d661901 100644
--- a/driver/runtime/rs_structs.h
+++ b/driver/runtime/rs_structs.h
@@ -1,6 +1,9 @@
 #ifndef _RS_STRUCTS_H_
 #define _RS_STRUCTS_H_
 
+#include "rs_core.rsh"
+#include "rs_graphics.rsh"
+
 /*****************************************************************************
  * CAUTION
  *
-- 
cgit v1.2.3