diff options
| author | Jean-Luc Brouillet <jeanluc@google.com> | 2015-04-02 22:43:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-04-02 22:44:13 +0000 |
| commit | 301dc422de63135cd617546dad52e11c89fafaf7 (patch) | |
| tree | ab04b1b46da1fc9f3eefb3d10c99409e1d816aef /driver | |
| parent | 826aebc96c13d951653d14c05d9f55ec1283ec30 (diff) | |
| parent | be2163801c33d6849ae580d42b919b8803d55095 (diff) | |
| download | rs-301dc422de63135cd617546dad52e11c89fafaf7.tar.gz | |
Merge "Reorganize the header files in a way that's easier to document."
Diffstat (limited to 'driver')
| -rw-r--r-- | driver/runtime/arch/clamp.c | 3 | ||||
| -rw-r--r-- | driver/runtime/arch/generic.c | 2 | ||||
| -rw-r--r-- | driver/runtime/rs_cl.c | 2 | ||||
| -rw-r--r-- | driver/runtime/rs_core.c | 1 | ||||
| -rw-r--r-- | driver/runtime/rs_structs.h | 3 |
5 files changed, 6 insertions, 5 deletions
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 * |