summaryrefslogtreecommitdiff
path: root/cpu_ref/rsCpuScript.cpp
diff options
context:
space:
mode:
authorDavid Gross <dgross@google.com>2015-05-29 11:38:15 -0700
committerDavid Gross <dgross@google.com>2015-05-29 13:40:12 -0700
commitb043df0676fef226336deb3a00ead2f31e02343f (patch)
tree896cf6dfafd9e746325bd1d47699cca682e1d946 /cpu_ref/rsCpuScript.cpp
parentcee9e9898ed549d00c1fd1c911feff66dbb4225e (diff)
downloadrs-b043df0676fef226336deb3a00ead2f31e02343f.tar.gz
Remove dead uses of RSCompilerDriver and of compiler callbacks.
Change-Id: Ibe8725074724b75e35c25a404daaba07ffbca2ab
Diffstat (limited to 'cpu_ref/rsCpuScript.cpp')
-rw-r--r--cpu_ref/rsCpuScript.cpp30
1 files changed, 0 insertions, 30 deletions
diff --git a/cpu_ref/rsCpuScript.cpp b/cpu_ref/rsCpuScript.cpp
index decafc6c..8d4f81e7 100644
--- a/cpu_ref/rsCpuScript.cpp
+++ b/cpu_ref/rsCpuScript.cpp
@@ -25,9 +25,7 @@
#else
#include "rsCppUtils.h"
- #include <bcc/BCCContext.h>
#include <bcc/Config/Config.h>
- #include <bcc/Renderscript/RSCompilerDriver.h>
#include <bcinfo/MetadataExtractor.h>
#include <cutils/properties.h>
@@ -230,11 +228,6 @@ RsdCpuScriptImpl::RsdCpuScriptImpl(RsdCpuReferenceImpl *ctx, const Script *s) {
mScriptSO = nullptr;
-#ifndef RS_COMPATIBILITY_LIB
- mCompilerDriver = nullptr;
-#endif
-
-
mRoot = nullptr;
mRootExpand = nullptr;
mInit = nullptr;
@@ -304,22 +297,6 @@ bool RsdCpuScriptImpl::init(char const *resName, char const *cacheDir,
#ifndef RS_COMPATIBILITY_LIB
bool useRSDebugContext = false;
- mCompilerDriver = nullptr;
-
- mCompilerDriver = new bcc::RSCompilerDriver();
- if (mCompilerDriver == nullptr) {
- ALOGE("bcc: FAILS to create compiler driver (out of memory)");
- mCtx->unlockMutex();
- return false;
- }
-
- // Run any compiler setup functions we have been provided with.
- RSSetupCompilerCallback setupCompilerCallback =
- mCtx->getSetupCompilerCallback();
- if (setupCompilerCallback != nullptr) {
- setupCompilerCallback(mCompilerDriver);
- }
-
bcinfo::MetadataExtractor bitcodeMetadata((const char *) bitcode, bitcodeSize);
if (!bitcodeMetadata.extract()) {
ALOGE("Could not extract metadata from bitcode");
@@ -330,7 +307,6 @@ bool RsdCpuScriptImpl::init(char const *resName, char const *cacheDir,
const char* core_lib = findCoreLib(bitcodeMetadata, (const char*)bitcode, bitcodeSize);
if (mCtx->getContext()->getContextType() == RS_CONTEXT_TYPE_DEBUG) {
- mCompilerDriver->setDebugContext(true);
useRSDebugContext = true;
}
@@ -875,12 +851,6 @@ const char* RsdCpuScriptImpl::getFieldName(uint32_t slot) const {
}
RsdCpuScriptImpl::~RsdCpuScriptImpl() {
-#ifndef RS_COMPATIBILITY_LIB
- if (mCompilerDriver) {
- delete mCompilerDriver;
- }
-#endif
-
if (mScriptExec != nullptr) {
delete mScriptExec;
}