From 18814f6bf3507291d1f2f5b57509cd92e5d20249 Mon Sep 17 00:00:00 2001 From: John Stultz Date: Thu, 22 Feb 2018 16:02:49 -0800 Subject: gralloc960: Update to the r9p0 gralloc release This is necessary in order to support r9p0 libGLES_mali.so binaries. NOTE: This unfortunately drops recent changes like v4.12+ ION abi compatibility, which will need to be re-implemented and re-added. NOTE: This change requires both kernel changes for the r9p0 driver as well as binariy r9p0 libGLES_mali.so libraries. Don't merge until those are all lined up to land. Change-Id: I6c7fdf7585edea08196d1a323db3ec0629883311 Signed-off-by: John Stultz --- gralloc960/mali_gralloc_bufferdescriptor.h | 68 ++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 gralloc960/mali_gralloc_bufferdescriptor.h (limited to 'gralloc960/mali_gralloc_bufferdescriptor.h') diff --git a/gralloc960/mali_gralloc_bufferdescriptor.h b/gralloc960/mali_gralloc_bufferdescriptor.h new file mode 100644 index 00000000..6783be07 --- /dev/null +++ b/gralloc960/mali_gralloc_bufferdescriptor.h @@ -0,0 +1,68 @@ +/* + * Copyright (C) 2016-2017 ARM Limited. All rights reserved. + * + * Copyright (C) 2008 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef MALI_GRALLOC_BUFFERDESCRIPTOR_H_ +#define MALI_GRALLOC_BUFFERDESCRIPTOR_H_ + +#include +#include "gralloc_priv.h" +#include "mali_gralloc_module.h" +#include "mali_gralloc_formats.h" + +#if GRALLOC_USE_GRALLOC1_API == 1 +#include +#else +#include +#endif + +typedef uint64_t gralloc_buffer_descriptor_t; + +typedef struct buffer_descriptor +{ + uint32_t width; + uint32_t height; + uint64_t producer_usage; + uint64_t consumer_usage; + uint64_t hal_format; + + mali_gralloc_format_type format_type; + size_t size; + int byte_stride; + int pixel_stride; + int internalWidth; + int internalHeight; + uint64_t internal_format; +} buffer_descriptor_t; + +#if GRALLOC_USE_GRALLOC1_API == 1 +int mali_gralloc_create_descriptor_internal(gralloc1_buffer_descriptor_t *outDescriptor); +int mali_gralloc_destroy_descriptor_internal(gralloc1_buffer_descriptor_t descriptor); +int mali_gralloc_set_dimensions_internal(gralloc1_buffer_descriptor_t descriptor, uint32_t width, uint32_t height); +int mali_gralloc_set_format_internal(gralloc1_buffer_descriptor_t descriptor, int32_t format); +int mali_gralloc_set_producerusage_internal(gralloc1_buffer_descriptor_t descriptor, uint64_t usage); +int mali_gralloc_set_consumerusage_internal(gralloc1_buffer_descriptor_t descriptor, uint64_t usage); + +int mali_gralloc_get_backing_store_internal(buffer_handle_t buffer, gralloc1_backing_store_t *outStore); +int mali_gralloc_get_consumer_usage_internal(buffer_handle_t buffer, uint64_t *outUsage); +int mali_gralloc_get_dimensions_internal(buffer_handle_t buffer, uint32_t *outWidth, uint32_t *outHeight); +int mali_gralloc_get_format_internal(buffer_handle_t buffer, int32_t *outFormat); +int mali_gralloc_get_producer_usage_internal(buffer_handle_t buffer, uint64_t *outUsage); +#endif +int mali_gralloc_query_getstride(buffer_handle_t handle, int *pixelStride); + +#endif /* MALI_GRALLOC_BUFFERDESCRIPTOR_H_ */ -- cgit v1.2.3