summaryrefslogtreecommitdiff
path: root/rs_hal.h
diff options
context:
space:
mode:
authorJean-Luc Brouillet <jeanluc@google.com>2017-01-19 22:11:40 -0800
committerJean-Luc Brouillet <jeanluc@google.com>2017-01-20 16:48:57 -0800
commit863237215cab4812df373b63ba3bbf2bc1d8647d (patch)
tree8d5b7fd5d956f7cf6aea27a88ce3192c48772e94 /rs_hal.h
parent8d8fabbccd1dffdb499bbf5264ccc399e1312835 (diff)
downloadrs-863237215cab4812df373b63ba3bbf2bc1d8647d.tar.gz
Cleanup makefiles and warning producing code.
Many entries in our makefiles are not needed: - LOCAL_CPPFLAGS += -fno-exceptions is the default - LOCAL_MODULE_TARGET_ARCH_WARN is obsolete - LOCAL_CXX_STL:= libc++ is the default - LOCAL_MODULE_TAGS := optional is the default - LOCAL_IS_HOST_MODULE := true is the default if we're using $include(BUILD_HOST_*). This can't be removed for the generated subdirectories however without triggering a bug in Ninja. - Removed the -ldl where not needed. - LOCAL_CLANG is no longer needed. Added -Werror -Wall -Wextra to a lot of targets and cleaned up the code that created errors. Removed some hacky code that would prevent tests/java_api from being compiled except under special cicumstances. Corrected some LOCAL_MODULE_TAGS that should have been set to tests. Cleanup warning producing code. Bug: 34265954 Test: Compiled the code. Test: Ran the cpp test, imageprocessing_jb, and cts Change-Id: I27da19b18a6c0ac3686bb8c93681e3d870d587fe
Diffstat (limited to 'rs_hal.h')
-rw-r--r--rs_hal.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/rs_hal.h b/rs_hal.h
index 7e07ddd9..34c6eae2 100644
--- a/rs_hal.h
+++ b/rs_hal.h
@@ -106,10 +106,15 @@ class FBOCache;
* v2 = reserved for use by vendor drivers
*/
+// RS_BASE_OBJ must have the same layout as _RS_OBJECT_DECL defined in
+// script_api/rs_object_types.spec.
+// TODO(jeanluc) Look at unifying.
#ifndef __LP64__
#define RS_BASE_OBJ(_t_) typedef struct { const _t_* p; } __attribute__((packed, aligned(4)))
+#define RS_BASE_NULL_OBJ {0}
#else
#define RS_BASE_OBJ(_t_) typedef struct { const _t_* p; const void* r; const void* v1; const void* v2; }
+#define RS_BASE_NULL_OBJ {0, 0, 0, 0}
#endif
RS_BASE_OBJ(ObjectBase) rs_object_base;