Merge "[hardware][interfaces][renderscript] fix -Wreorder-init-list" (cd08ce79) · Commits · e / os / android_hardware_interfaces

renderscript/1.0/default/Device.cpp

+110 −144

Original line number	Original line	Diff line number	Diff line
	@@ -88,127 +88,97 @@ dispatchTable loadHAL() {
	dispatchTable dispatchHal = {		dispatchTable dispatchHal = {
	.SetNativeLibDir = (SetNativeLibDirFnPtr) nullptr,		.SetNativeLibDir = (SetNativeLibDirFnPtr) nullptr,

	.Allocation1DData =		.Allocation1DData = (Allocation1DDataFnPtr)dlsym(handle, "rsAllocation1DData"),
	(Allocation1DDataFnPtr)dlsym(handle, "rsAllocation1DData"),
	.Allocation1DElementData = (Allocation1DElementDataFnPtr) nullptr,		.Allocation1DElementData = (Allocation1DElementDataFnPtr) nullptr,
	.Allocation1DRead =		.Allocation1DRead = (Allocation1DReadFnPtr)dlsym(handle, "rsAllocation1DRead"),
	(Allocation1DReadFnPtr)dlsym(handle, "rsAllocation1DRead"),		.Allocation2DData = (Allocation2DDataFnPtr)dlsym(handle, "rsAllocation2DData"),
	.Allocation2DData =		.Allocation2DRead = (Allocation2DReadFnPtr)dlsym(handle, "rsAllocation2DRead"),
	(Allocation2DDataFnPtr)dlsym(handle, "rsAllocation2DData"),		.Allocation3DData = (Allocation3DDataFnPtr)dlsym(handle, "rsAllocation3DData"),
	.Allocation2DRead =		.Allocation3DRead = (Allocation3DReadFnPtr)dlsym(handle, "rsAllocation3DRead"),
	(Allocation2DReadFnPtr)dlsym(handle, "rsAllocation2DRead"),		.AllocationAdapterCreate =
	.Allocation3DData =		(AllocationAdapterCreateFnPtr)dlsym(handle, "rsAllocationAdapterCreate"),
	(Allocation3DDataFnPtr)dlsym(handle, "rsAllocation3DData"),		.AllocationAdapterOffset =
	.Allocation3DRead =		(AllocationAdapterOffsetFnPtr)dlsym(handle, "rsAllocationAdapterOffset"),
	(Allocation3DReadFnPtr)dlsym(handle, "rsAllocation3DRead"),		.AllocationCopy2DRange =
	.AllocationAdapterCreate = (AllocationAdapterCreateFnPtr)dlsym(		(AllocationCopy2DRangeFnPtr)dlsym(handle, "rsAllocationCopy2DRange"),
	handle, "rsAllocationAdapterCreate"),		.AllocationCopy3DRange =
	.AllocationAdapterOffset = (AllocationAdapterOffsetFnPtr)dlsym(		(AllocationCopy3DRangeFnPtr)dlsym(handle, "rsAllocationCopy3DRange"),
	handle, "rsAllocationAdapterOffset"),		.AllocationCopyToBitmap =
	.AllocationCopy2DRange = (AllocationCopy2DRangeFnPtr)dlsym(		(AllocationCopyToBitmapFnPtr)dlsym(handle, "rsAllocationCopyToBitmap"),
	handle, "rsAllocationCopy2DRange"),		.AllocationCreateFromBitmap =
	.AllocationCopy3DRange = (AllocationCopy3DRangeFnPtr)dlsym(		(AllocationCreateFromBitmapFnPtr)dlsym(handle, "rsAllocationCreateFromBitmap"),
	handle, "rsAllocationCopy3DRange"),		.AllocationCreateStrided =
	.AllocationCopyToBitmap = (AllocationCopyToBitmapFnPtr)dlsym(		(AllocationCreateStridedFnPtr)dlsym(handle, "rsAllocationCreateStrided"),
	handle, "rsAllocationCopyToBitmap"),		.AllocationCreateTyped =
	.AllocationCreateFromBitmap = (AllocationCreateFromBitmapFnPtr)dlsym(		(AllocationCreateTypedFnPtr)dlsym(handle, "rsAllocationCreateTyped"),
	handle, "rsAllocationCreateFromBitmap"),		.AllocationCubeCreateFromBitmap = (AllocationCubeCreateFromBitmapFnPtr)dlsym(
	.AllocationCreateStrided = (AllocationCreateStridedFnPtr)dlsym(
	handle, "rsAllocationCreateStrided"),
	.AllocationCreateTyped = (AllocationCreateTypedFnPtr)dlsym(
	handle, "rsAllocationCreateTyped"),
	.AllocationCubeCreateFromBitmap =
	(AllocationCubeCreateFromBitmapFnPtr)dlsym(
	handle, "rsAllocationCubeCreateFromBitmap"),		handle, "rsAllocationCubeCreateFromBitmap"),
	.AllocationElementData = (AllocationElementDataFnPtr)dlsym(		.AllocationElementData =
	handle, "rsAllocationElementData"),		(AllocationElementDataFnPtr)dlsym(handle, "rsAllocationElementData"),
	.AllocationElementRead = (AllocationElementReadFnPtr)dlsym(		.AllocationElementRead =
	handle, "rsAllocationElementRead"),		(AllocationElementReadFnPtr)dlsym(handle, "rsAllocationElementRead"),
	.AllocationGenerateMipmaps = (AllocationGenerateMipmapsFnPtr)dlsym(		.AllocationGenerateMipmaps =
	handle, "rsAllocationGenerateMipmaps"),		(AllocationGenerateMipmapsFnPtr)dlsym(handle, "rsAllocationGenerateMipmaps"),
	.AllocationGetPointer =		.AllocationGetPointer =
	(AllocationGetPointerFnPtr)dlsym(handle, "rsAllocationGetPointer"),		(AllocationGetPointerFnPtr)dlsym(handle, "rsAllocationGetPointer"),
	.AllocationGetSurface =		.AllocationGetSurface =
	(AllocationGetSurfaceFnPtr)dlsym(handle, "rsAllocationGetSurface"),		(AllocationGetSurfaceFnPtr)dlsym(handle, "rsAllocationGetSurface"),
	.AllocationGetType =		.AllocationGetType = (AllocationGetTypeFnPtr)dlsym(handle, "rsaAllocationGetType"),
	(AllocationGetTypeFnPtr)dlsym(handle, "rsaAllocationGetType"),		.AllocationIoReceive = (AllocationIoReceiveFnPtr)dlsym(handle, "rsAllocationIoReceive"),
	.AllocationIoReceive =		.AllocationIoSend = (AllocationIoSendFnPtr)dlsym(handle, "rsAllocationIoSend"),
	(AllocationIoReceiveFnPtr)dlsym(handle, "rsAllocationIoReceive"),		.AllocationRead = (AllocationReadFnPtr)dlsym(handle, "rsAllocationRead"),
	.AllocationIoSend =		.AllocationResize1D = (AllocationResize1DFnPtr)dlsym(handle, "rsAllocationResize1D"),
	(AllocationIoSendFnPtr)dlsym(handle, "rsAllocationIoSend"),
	.AllocationRead =
	(AllocationReadFnPtr)dlsym(handle, "rsAllocationRead"),
	.AllocationResize1D =
	(AllocationResize1DFnPtr)dlsym(handle, "rsAllocationResize1D"),
	.AllocationSetSurface =		.AllocationSetSurface =
	(AllocationSetSurfaceFnPtr)dlsym(handle, "rsAllocationSetSurface"),		(AllocationSetSurfaceFnPtr)dlsym(handle, "rsAllocationSetSurface"),
	.AllocationSetupBufferQueue = (AllocationSetupBufferQueueFnPtr)dlsym(		.AllocationSyncAll = (AllocationSyncAllFnPtr)dlsym(handle, "rsAllocationSyncAll"),
	handle, "rsAllocationSetupBufferQueue"),		.AllocationSetupBufferQueue =
	.AllocationShareBufferQueue = (AllocationShareBufferQueueFnPtr)dlsym(		(AllocationSetupBufferQueueFnPtr)dlsym(handle, "rsAllocationSetupBufferQueue"),
	handle, "rsAllocationShareBufferQueue"),		.AllocationShareBufferQueue =
	.AllocationSyncAll =		(AllocationShareBufferQueueFnPtr)dlsym(handle, "rsAllocationShareBufferQueue"),
	(AllocationSyncAllFnPtr)dlsym(handle, "rsAllocationSyncAll"),
	.AssignName = (AssignNameFnPtr)dlsym(handle, "rsAssignName"),		.AssignName = (AssignNameFnPtr)dlsym(handle, "rsAssignName"),
	.ClosureCreate = (ClosureCreateFnPtr)dlsym(handle, "rsClosureCreate"),		.ClosureCreate = (ClosureCreateFnPtr)dlsym(handle, "rsClosureCreate"),
	.ClosureSetArg = (ClosureSetArgFnPtr)dlsym(handle, "rsClosureSetArg"),		.ClosureSetArg = (ClosureSetArgFnPtr)dlsym(handle, "rsClosureSetArg"),
	.ClosureSetGlobal =		.ClosureSetGlobal = (ClosureSetGlobalFnPtr)dlsym(handle, "rsClosureSetGlobal"),
	(ClosureSetGlobalFnPtr)dlsym(handle, "rsClosureSetGlobal"),		.ContextCreateVendor = (ContextCreateVendorFnPtr)dlsym(handle, "rsContextCreateVendor"),
	.ContextCreateVendor =		.ContextDeinitToClient =
	(ContextCreateVendorFnPtr)dlsym(handle, "rsContextCreateVendor"),		(ContextDeinitToClientFnPtr)dlsym(handle, "rsContextDeinitToClient"),
	.ContextDeinitToClient = (ContextDeinitToClientFnPtr)dlsym(		.ContextDestroy = (ContextDestroyFnPtr)dlsym(handle, "rsContextDestroy"),
	handle, "rsContextDeinitToClient"),
	.ContextDestroy =
	(ContextDestroyFnPtr)dlsym(handle, "rsContextDestroy"),
	.ContextDump = (ContextDumpFnPtr)dlsym(handle, "rsContextDump"),		.ContextDump = (ContextDumpFnPtr)dlsym(handle, "rsContextDump"),
	.ContextFinish = (ContextFinishFnPtr)dlsym(handle, "rsContextFinish"),		.ContextFinish = (ContextFinishFnPtr)dlsym(handle, "rsContextFinish"),
	.ContextGetMessage =		.ContextGetMessage = (ContextGetMessageFnPtr)dlsym(handle, "rsContextGetMessage"),
	(ContextGetMessageFnPtr)dlsym(handle, "rsContextGetMessage"),		.ContextInitToClient = (ContextInitToClientFnPtr)dlsym(handle, "rsContextInitToClient"),
	.ContextInitToClient =		.ContextPeekMessage = (ContextPeekMessageFnPtr)dlsym(handle, "rsContextPeekMessage"),
	(ContextInitToClientFnPtr)dlsym(handle, "rsContextInitToClient"),		.ContextSendMessage = (ContextSendMessageFnPtr)dlsym(handle, "rsContextSendMessage"),
	.ContextPeekMessage =		.ContextSetPriority = (ContextSetPriorityFnPtr)dlsym(handle, "rsContextSetPriority"),
	(ContextPeekMessageFnPtr)dlsym(handle, "rsContextPeekMessage"),		.ContextSetCacheDir = (ContextSetCacheDirFnPtr)dlsym(handle, "rsContextSetCacheDir"),
	.ContextSendMessage =
	(ContextSendMessageFnPtr)dlsym(handle, "rsContextSendMessage"),
	.ContextSetCacheDir =
	(ContextSetCacheDirFnPtr)dlsym(handle, "rsContextSetCacheDir"),
	.ContextSetPriority =
	(ContextSetPriorityFnPtr)dlsym(handle, "rsContextSetPriority"),
	.DeviceCreate = (DeviceCreateFnPtr) nullptr,		.DeviceCreate = (DeviceCreateFnPtr) nullptr,
	.DeviceDestroy = (DeviceDestroyFnPtr) nullptr,		.DeviceDestroy = (DeviceDestroyFnPtr) nullptr,
	.DeviceSetConfig = (DeviceSetConfigFnPtr) nullptr,		.DeviceSetConfig = (DeviceSetConfigFnPtr) nullptr,
	.ElementCreate2 =		.ElementCreate2 = (ElementCreate2FnPtr)dlsym(handle, "rsElementCreate2"),
	(ElementCreate2FnPtr)dlsym(handle, "rsElementCreate2"),
	.ElementCreate = (ElementCreateFnPtr)dlsym(handle, "rsElementCreate"),		.ElementCreate = (ElementCreateFnPtr)dlsym(handle, "rsElementCreate"),
	.ElementGetNativeData =		.ElementGetNativeData =
	(ElementGetNativeDataFnPtr)dlsym(handle, "rsaElementGetNativeData"),		(ElementGetNativeDataFnPtr)dlsym(handle, "rsaElementGetNativeData"),
	.ElementGetSubElements = (ElementGetSubElementsFnPtr)dlsym(		.ElementGetSubElements =
	handle, "rsaElementGetSubElements"),		(ElementGetSubElementsFnPtr)dlsym(handle, "rsaElementGetSubElements"),
	.GetName = (GetNameFnPtr)dlsym(handle, "rsaGetName"),		.GetName = (GetNameFnPtr)dlsym(handle, "rsaGetName"),
	.InvokeClosureCreate =		.InvokeClosureCreate = (InvokeClosureCreateFnPtr)dlsym(handle, "rsInvokeClosureCreate"),
	(InvokeClosureCreateFnPtr)dlsym(handle, "rsInvokeClosureCreate"),
	.ObjDestroy = (ObjDestroyFnPtr)dlsym(handle, "rsObjDestroy"),		.ObjDestroy = (ObjDestroyFnPtr)dlsym(handle, "rsObjDestroy"),
	.SamplerCreate = (SamplerCreateFnPtr)dlsym(handle, "rsSamplerCreate"),		.SamplerCreate = (SamplerCreateFnPtr)dlsym(handle, "rsSamplerCreate"),
	.ScriptBindAllocation =		.ScriptBindAllocation =
	(ScriptBindAllocationFnPtr)dlsym(handle, "rsScriptBindAllocation"),		(ScriptBindAllocationFnPtr)dlsym(handle, "rsScriptBindAllocation"),
	.ScriptCCreate = (ScriptCCreateFnPtr)dlsym(handle, "rsScriptCCreate"),		.ScriptCCreate = (ScriptCCreateFnPtr)dlsym(handle, "rsScriptCCreate"),
	.ScriptFieldIDCreate =		.ScriptFieldIDCreate = (ScriptFieldIDCreateFnPtr)dlsym(handle, "rsScriptFieldIDCreate"),
	(ScriptFieldIDCreateFnPtr)dlsym(handle, "rsScriptFieldIDCreate"),
	.ScriptForEach = (ScriptForEachFnPtr) nullptr,		.ScriptForEach = (ScriptForEachFnPtr) nullptr,
	.ScriptForEachMulti =		.ScriptForEachMulti = (ScriptForEachMultiFnPtr)dlsym(handle, "rsScriptForEachMulti"),
	(ScriptForEachMultiFnPtr)dlsym(handle, "rsScriptForEachMulti"),
	.ScriptGetVarV = (ScriptGetVarVFnPtr)dlsym(handle, "rsScriptGetVarV"),		.ScriptGetVarV = (ScriptGetVarVFnPtr)dlsym(handle, "rsScriptGetVarV"),
	.ScriptGroup2Create =		.ScriptGroup2Create = (ScriptGroup2CreateFnPtr)dlsym(handle, "rsScriptGroup2Create"),
	(ScriptGroup2CreateFnPtr)dlsym(handle, "rsScriptGroup2Create"),		.ScriptGroupCreate = (ScriptGroupCreateFnPtr)dlsym(handle, "rsScriptGroupCreate"),
	.ScriptGroupCreate =		.ScriptGroupExecute = (ScriptGroupExecuteFnPtr)dlsym(handle, "rsScriptGroupExecute"),
	(ScriptGroupCreateFnPtr)dlsym(handle, "rsScriptGroupCreate"),		.ScriptGroupSetInput = (ScriptGroupSetInputFnPtr)dlsym(handle, "rsScriptGroupSetInput"),
	.ScriptGroupExecute =
	(ScriptGroupExecuteFnPtr)dlsym(handle, "rsScriptGroupExecute"),
	.ScriptGroupSetInput =
	(ScriptGroupSetInputFnPtr)dlsym(handle, "rsScriptGroupSetInput"),
	.ScriptGroupSetOutput =		.ScriptGroupSetOutput =
	(ScriptGroupSetOutputFnPtr)dlsym(handle, "rsScriptGroupSetOutput"),		(ScriptGroupSetOutputFnPtr)dlsym(handle, "rsScriptGroupSetOutput"),
	.ScriptIntrinsicCreate = (ScriptIntrinsicCreateFnPtr)dlsym(		.ScriptIntrinsicCreate =
	handle, "rsScriptIntrinsicCreate"),		(ScriptIntrinsicCreateFnPtr)dlsym(handle, "rsScriptIntrinsicCreate"),
	.ScriptInvoke = (ScriptInvokeFnPtr)dlsym(handle, "rsScriptInvoke"),		.ScriptInvoke = (ScriptInvokeFnPtr)dlsym(handle, "rsScriptInvoke"),
	.ScriptInvokeIDCreate =		.ScriptInvokeIDCreate =
	(ScriptInvokeIDCreateFnPtr)dlsym(handle, "rsScriptInvokeIDCreate"),		(ScriptInvokeIDCreateFnPtr)dlsym(handle, "rsScriptInvokeIDCreate"),
	@@ -216,20 +186,16 @@ dispatchTable loadHAL() {
	.ScriptKernelIDCreate =		.ScriptKernelIDCreate =
	(ScriptKernelIDCreateFnPtr)dlsym(handle, "rsScriptKernelIDCreate"),		(ScriptKernelIDCreateFnPtr)dlsym(handle, "rsScriptKernelIDCreate"),
	.ScriptReduce = (ScriptReduceFnPtr)dlsym(handle, "rsScriptReduce"),		.ScriptReduce = (ScriptReduceFnPtr)dlsym(handle, "rsScriptReduce"),
	.ScriptSetTimeZone =		.ScriptSetTimeZone = (ScriptSetTimeZoneFnPtr)dlsym(handle, "rsScriptSetTimeZone"),
	(ScriptSetTimeZoneFnPtr)dlsym(handle, "rsScriptSetTimeZone"),
	.ScriptSetVarD = (ScriptSetVarDFnPtr)dlsym(handle, "rsScriptSetVarD"),		.ScriptSetVarD = (ScriptSetVarDFnPtr)dlsym(handle, "rsScriptSetVarD"),
	.ScriptSetVarF = (ScriptSetVarFFnPtr)dlsym(handle, "rsScriptSetVarF"),		.ScriptSetVarF = (ScriptSetVarFFnPtr)dlsym(handle, "rsScriptSetVarF"),
	.ScriptSetVarI = (ScriptSetVarIFnPtr)dlsym(handle, "rsScriptSetVarI"),		.ScriptSetVarI = (ScriptSetVarIFnPtr)dlsym(handle, "rsScriptSetVarI"),
	.ScriptSetVarJ = (ScriptSetVarJFnPtr)dlsym(handle, "rsScriptSetVarJ"),		.ScriptSetVarJ = (ScriptSetVarJFnPtr)dlsym(handle, "rsScriptSetVarJ"),
	.ScriptSetVarObj =		.ScriptSetVarObj = (ScriptSetVarObjFnPtr)dlsym(handle, "rsScriptSetVarObj"),
	(ScriptSetVarObjFnPtr)dlsym(handle, "rsScriptSetVarObj"),		.ScriptSetVarVE = (ScriptSetVarVEFnPtr)dlsym(handle, "rsScriptSetVarVE"),
	.ScriptSetVarVE =
	(ScriptSetVarVEFnPtr)dlsym(handle, "rsScriptSetVarVE"),
	.ScriptSetVarV = (ScriptSetVarVFnPtr)dlsym(handle, "rsScriptSetVarV"),		.ScriptSetVarV = (ScriptSetVarVFnPtr)dlsym(handle, "rsScriptSetVarV"),
	.TypeCreate = (TypeCreateFnPtr)dlsym(handle, "rsTypeCreate"),		.TypeCreate = (TypeCreateFnPtr)dlsym(handle, "rsTypeCreate"),
	.TypeGetNativeData =		.TypeGetNativeData = (TypeGetNativeDataFnPtr)dlsym(handle, "rsaTypeGetNativeData"),
	(TypeGetNativeDataFnPtr)dlsym(handle, "rsaTypeGetNativeData"),
	};		};

	return dispatchHal;		return dispatchHal;