diff options
author | Miao Wang <miaowang@google.com> | 2017-06-02 23:16:05 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-06-02 23:16:07 +0000 |
commit | 292cddf6be7df898aa13bbdf3e7296524f12b5c9 (patch) | |
tree | 963c1a3520dee8ef82a1f31f105b33ae8721e3c3 /renderscript | |
parent | 0c49ae609f40494e5c58321b116787619424aeb3 (diff) | |
parent | fdd834565cb5a506a842309b8e7cae71cdd41b5b (diff) | |
download | platform_hardware_interfaces-292cddf6be7df898aa13bbdf3e7296524f12b5c9.tar.gz platform_hardware_interfaces-292cddf6be7df898aa13bbdf3e7296524f12b5c9.tar.bz2 platform_hardware_interfaces-292cddf6be7df898aa13bbdf3e7296524f12b5c9.zip |
Merge "[RenderScript] Use OVERRIDE_RS_DRIVER string in the default implementation."
Diffstat (limited to 'renderscript')
-rw-r--r-- | renderscript/1.0/default/Android.bp | 7 | ||||
-rw-r--r-- | renderscript/1.0/default/Context.cpp | 14 | ||||
-rw-r--r-- | renderscript/1.0/default/Device.cpp | 65 |
3 files changed, 61 insertions, 25 deletions
diff --git a/renderscript/1.0/default/Android.bp b/renderscript/1.0/default/Android.bp index c4bd1b36a4..b9969697fe 100644 --- a/renderscript/1.0/default/Android.bp +++ b/renderscript/1.0/default/Android.bp @@ -18,4 +18,11 @@ cc_library_shared { "libutils", "android.hardware.renderscript@1.0", ], + + product_variables: { + override_rs_driver: { + cflags: ["-DOVERRIDE_RS_DRIVER=%s"], + }, + }, + } diff --git a/renderscript/1.0/default/Context.cpp b/renderscript/1.0/default/Context.cpp index 389b6e7bcb..c2d7507f6d 100644 --- a/renderscript/1.0/default/Context.cpp +++ b/renderscript/1.0/default/Context.cpp @@ -16,7 +16,19 @@ Context::Context(uint32_t sdkVersion, ContextType ct, int32_t flags) { uint32_t _sdkVersion = sdkVersion; RsContextType _ct = static_cast<RsContextType>(ct); int32_t _flags = flags; - mContext = Device::getHal().ContextCreate(_dev, _version, _sdkVersion, _ct, _flags); + const char* driverName = nullptr; + +#ifdef OVERRIDE_RS_DRIVER +#define XSTR(S) #S +#define STR(S) XSTR(S) +#define OVERRIDE_RS_DRIVER_STRING STR(OVERRIDE_RS_DRIVER) + static std::string driverString(OVERRIDE_RS_DRIVER_STRING); + driverName = driverString.c_str(); +#undef XSTR +#undef STR +#endif // OVERRIDE_RS_DRIVER + mContext = + Device::getHal().ContextCreateVendor(_dev, _version, _sdkVersion, _ct, _flags, driverName); } diff --git a/renderscript/1.0/default/Device.cpp b/renderscript/1.0/default/Device.cpp index 86cf8ebb57..406602e4b0 100644 --- a/renderscript/1.0/default/Device.cpp +++ b/renderscript/1.0/default/Device.cpp @@ -42,27 +42,39 @@ dispatchTable loadHAL() { void* handle = dlopen(filename, RTLD_LAZY | RTLD_LOCAL); dispatchTable dispatchHal = { - .SetNativeLibDir = (SetNativeLibDirFnPtr)nullptr, + .SetNativeLibDir = (SetNativeLibDirFnPtr) nullptr, .Allocation1DData = (Allocation1DDataFnPtr)dlsym(handle, "rsAllocation1DData"), - .Allocation1DElementData = (Allocation1DElementDataFnPtr)nullptr, + .Allocation1DElementData = (Allocation1DElementDataFnPtr) nullptr, .Allocation1DRead = (Allocation1DReadFnPtr)dlsym(handle, "rsAllocation1DRead"), .Allocation2DData = (Allocation2DDataFnPtr)dlsym(handle, "rsAllocation2DData"), .Allocation2DRead = (Allocation2DReadFnPtr)dlsym(handle, "rsAllocation2DRead"), .Allocation3DData = (Allocation3DDataFnPtr)dlsym(handle, "rsAllocation3DData"), .Allocation3DRead = (Allocation3DReadFnPtr)dlsym(handle, "rsAllocation3DRead"), - .AllocationAdapterCreate = (AllocationAdapterCreateFnPtr)dlsym(handle, "rsAllocationAdapterCreate"), - .AllocationAdapterOffset = (AllocationAdapterOffsetFnPtr)dlsym(handle, "rsAllocationAdapterOffset"), - .AllocationCopy2DRange = (AllocationCopy2DRangeFnPtr)dlsym(handle, "rsAllocationCopy2DRange"), - .AllocationCopy3DRange = (AllocationCopy3DRangeFnPtr)dlsym(handle, "rsAllocationCopy3DRange"), - .AllocationCopyToBitmap = (AllocationCopyToBitmapFnPtr)dlsym(handle, "rsAllocationCopyToBitmap"), - .AllocationCreateFromBitmap = (AllocationCreateFromBitmapFnPtr)dlsym(handle, "rsAllocationCreateFromBitmap"), - .AllocationCreateStrided = (AllocationCreateStridedFnPtr)dlsym(handle, "rsAllocationCreateStrided"), - .AllocationCreateTyped = (AllocationCreateTypedFnPtr)dlsym(handle, "rsAllocationCreateTyped"), - .AllocationCubeCreateFromBitmap = (AllocationCubeCreateFromBitmapFnPtr)dlsym(handle, "rsAllocationCubeCreateFromBitmap"), - .AllocationElementData = (AllocationElementDataFnPtr)dlsym(handle, "rsAllocationElementData"), - .AllocationElementRead = (AllocationElementReadFnPtr)dlsym(handle, "rsAllocationElementRead"), - .AllocationGenerateMipmaps = (AllocationGenerateMipmapsFnPtr)dlsym(handle, "rsAllocationGenerateMipmaps"), + .AllocationAdapterCreate = + (AllocationAdapterCreateFnPtr)dlsym(handle, "rsAllocationAdapterCreate"), + .AllocationAdapterOffset = + (AllocationAdapterOffsetFnPtr)dlsym(handle, "rsAllocationAdapterOffset"), + .AllocationCopy2DRange = + (AllocationCopy2DRangeFnPtr)dlsym(handle, "rsAllocationCopy2DRange"), + .AllocationCopy3DRange = + (AllocationCopy3DRangeFnPtr)dlsym(handle, "rsAllocationCopy3DRange"), + .AllocationCopyToBitmap = + (AllocationCopyToBitmapFnPtr)dlsym(handle, "rsAllocationCopyToBitmap"), + .AllocationCreateFromBitmap = + (AllocationCreateFromBitmapFnPtr)dlsym(handle, "rsAllocationCreateFromBitmap"), + .AllocationCreateStrided = + (AllocationCreateStridedFnPtr)dlsym(handle, "rsAllocationCreateStrided"), + .AllocationCreateTyped = + (AllocationCreateTypedFnPtr)dlsym(handle, "rsAllocationCreateTyped"), + .AllocationCubeCreateFromBitmap = + (AllocationCubeCreateFromBitmapFnPtr)dlsym(handle, "rsAllocationCubeCreateFromBitmap"), + .AllocationElementData = + (AllocationElementDataFnPtr)dlsym(handle, "rsAllocationElementData"), + .AllocationElementRead = + (AllocationElementReadFnPtr)dlsym(handle, "rsAllocationElementRead"), + .AllocationGenerateMipmaps = + (AllocationGenerateMipmapsFnPtr)dlsym(handle, "rsAllocationGenerateMipmaps"), .AllocationGetPointer = (AllocationGetPointerFnPtr)dlsym(handle, "rsAllocationGetPointer"), .AllocationGetSurface = (AllocationGetSurfaceFnPtr)dlsym(handle, "rsAllocationGetSurface"), .AllocationGetType = (AllocationGetTypeFnPtr)dlsym(handle, "rsaAllocationGetType"), @@ -71,15 +83,18 @@ dispatchTable loadHAL() { .AllocationRead = (AllocationReadFnPtr)dlsym(handle, "rsAllocationRead"), .AllocationResize1D = (AllocationResize1DFnPtr)dlsym(handle, "rsAllocationResize1D"), .AllocationSetSurface = (AllocationSetSurfaceFnPtr)dlsym(handle, "rsAllocationSetSurface"), - .AllocationSetupBufferQueue = (AllocationSetupBufferQueueFnPtr)dlsym(handle, "rsAllocationSetupBufferQueue"), - .AllocationShareBufferQueue = (AllocationShareBufferQueueFnPtr)dlsym(handle, "rsAllocationShareBufferQueue"), + .AllocationSetupBufferQueue = + (AllocationSetupBufferQueueFnPtr)dlsym(handle, "rsAllocationSetupBufferQueue"), + .AllocationShareBufferQueue = + (AllocationShareBufferQueueFnPtr)dlsym(handle, "rsAllocationShareBufferQueue"), .AllocationSyncAll = (AllocationSyncAllFnPtr)dlsym(handle, "rsAllocationSyncAll"), .AssignName = (AssignNameFnPtr)dlsym(handle, "rsAssignName"), .ClosureCreate = (ClosureCreateFnPtr)dlsym(handle, "rsClosureCreate"), .ClosureSetArg = (ClosureSetArgFnPtr)dlsym(handle, "rsClosureSetArg"), .ClosureSetGlobal = (ClosureSetGlobalFnPtr)dlsym(handle, "rsClosureSetGlobal"), - .ContextCreate = (ContextCreateFnPtr)dlsym(handle, "rsContextCreate"), - .ContextDeinitToClient = (ContextDeinitToClientFnPtr)dlsym(handle, "rsContextDeinitToClient"), + .ContextCreateVendor = (ContextCreateVendorFnPtr)dlsym(handle, "rsContextCreateVendor"), + .ContextDeinitToClient = + (ContextDeinitToClientFnPtr)dlsym(handle, "rsContextDeinitToClient"), .ContextDestroy = (ContextDestroyFnPtr)dlsym(handle, "rsContextDestroy"), .ContextDump = (ContextDumpFnPtr)dlsym(handle, "rsContextDump"), .ContextFinish = (ContextFinishFnPtr)dlsym(handle, "rsContextFinish"), @@ -89,13 +104,14 @@ dispatchTable loadHAL() { .ContextSendMessage = (ContextSendMessageFnPtr)dlsym(handle, "rsContextSendMessage"), .ContextSetCacheDir = (ContextSetCacheDirFnPtr)dlsym(handle, "rsContextSetCacheDir"), .ContextSetPriority = (ContextSetPriorityFnPtr)dlsym(handle, "rsContextSetPriority"), - .DeviceCreate = (DeviceCreateFnPtr)nullptr, - .DeviceDestroy = (DeviceDestroyFnPtr)nullptr, - .DeviceSetConfig = (DeviceSetConfigFnPtr)nullptr, + .DeviceCreate = (DeviceCreateFnPtr) nullptr, + .DeviceDestroy = (DeviceDestroyFnPtr) nullptr, + .DeviceSetConfig = (DeviceSetConfigFnPtr) nullptr, .ElementCreate2 = (ElementCreate2FnPtr)dlsym(handle, "rsElementCreate2"), .ElementCreate = (ElementCreateFnPtr)dlsym(handle, "rsElementCreate"), .ElementGetNativeData = (ElementGetNativeDataFnPtr)dlsym(handle, "rsaElementGetNativeData"), - .ElementGetSubElements = (ElementGetSubElementsFnPtr)dlsym(handle, "rsaElementGetSubElements"), + .ElementGetSubElements = + (ElementGetSubElementsFnPtr)dlsym(handle, "rsaElementGetSubElements"), .GetName = (GetNameFnPtr)dlsym(handle, "rsaGetName"), .InvokeClosureCreate = (InvokeClosureCreateFnPtr)dlsym(handle, "rsInvokeClosureCreate"), .ObjDestroy = (ObjDestroyFnPtr)dlsym(handle, "rsObjDestroy"), @@ -103,7 +119,7 @@ dispatchTable loadHAL() { .ScriptBindAllocation = (ScriptBindAllocationFnPtr)dlsym(handle, "rsScriptBindAllocation"), .ScriptCCreate = (ScriptCCreateFnPtr)dlsym(handle, "rsScriptCCreate"), .ScriptFieldIDCreate = (ScriptFieldIDCreateFnPtr)dlsym(handle, "rsScriptFieldIDCreate"), - .ScriptForEach = (ScriptForEachFnPtr)nullptr, + .ScriptForEach = (ScriptForEachFnPtr) nullptr, .ScriptForEachMulti = (ScriptForEachMultiFnPtr)dlsym(handle, "rsScriptForEachMulti"), .ScriptGetVarV = (ScriptGetVarVFnPtr)dlsym(handle, "rsScriptGetVarV"), .ScriptGroup2Create = (ScriptGroup2CreateFnPtr)dlsym(handle, "rsScriptGroup2Create"), @@ -111,7 +127,8 @@ dispatchTable loadHAL() { .ScriptGroupExecute = (ScriptGroupExecuteFnPtr)dlsym(handle, "rsScriptGroupExecute"), .ScriptGroupSetInput = (ScriptGroupSetInputFnPtr)dlsym(handle, "rsScriptGroupSetInput"), .ScriptGroupSetOutput = (ScriptGroupSetOutputFnPtr)dlsym(handle, "rsScriptGroupSetOutput"), - .ScriptIntrinsicCreate = (ScriptIntrinsicCreateFnPtr)dlsym(handle, "rsScriptIntrinsicCreate"), + .ScriptIntrinsicCreate = + (ScriptIntrinsicCreateFnPtr)dlsym(handle, "rsScriptIntrinsicCreate"), .ScriptInvoke = (ScriptInvokeFnPtr)dlsym(handle, "rsScriptInvoke"), .ScriptInvokeIDCreate = (ScriptInvokeIDCreateFnPtr)dlsym(handle, "rsScriptInvokeIDCreate"), .ScriptInvokeV = (ScriptInvokeVFnPtr)dlsym(handle, "rsScriptInvokeV"), |