diff options
| -rw-r--r-- | include/linux/EGL/eglplatform.h | 9 | ||||
| -rw-r--r-- | include/linux/EGL/fbdev_window.h | 50 |
2 files changed, 4 insertions, 55 deletions
diff --git a/include/linux/EGL/eglplatform.h b/include/linux/EGL/eglplatform.h index cc4b100c30..914a7ef592 100644 --- a/include/linux/EGL/eglplatform.h +++ b/include/linux/EGL/eglplatform.h @@ -2,7 +2,7 @@ #define __eglplatform_h_ /* -** Copyright (c) 2007-2009 The Khronos Group Inc. +** Copyright (c) 2007-2019 The Khronos Group Inc. ** ** Permission is hereby granted, free of charge, to any person obtaining a ** copy of this software and/or associated documentation files (the @@ -84,11 +84,10 @@ typedef void *EGLNativeWindowType; typedef void *EGLNativePixmapType; #elif (defined(__arm__) || defined(__aarch64__)) && defined(__gnu_linux__) /* ARM Linux Mali */ -#include <EGL/fbdev_window.h> -typedef void* EGLNativeDisplayType; -typedef void* EGLNativePixmapType; -typedef fbdev_window* EGLNativeWindowType; +typedef int EGLNativeDisplayType; +typedef void *EGLNativeWindowType; +typedef void *EGLNativePixmapType; #elif defined(__unix__) diff --git a/include/linux/EGL/fbdev_window.h b/include/linux/EGL/fbdev_window.h deleted file mode 100644 index f5f90b5370..0000000000 --- a/include/linux/EGL/fbdev_window.h +++ /dev/null @@ -1,50 +0,0 @@ -/* vim:set sts=4 ts=4 noexpandtab: */ -/* - * This confidential and proprietary software may be used only as - * authorised by a licensing agreement from ARM Limited - * (C) COPYRIGHT 2008,2009 ARM Limited - * ALL RIGHTS RESERVED - * The entire notice above must be reproduced on all authorised - * copies and copies may only be made to the extent permitted - * by a licensing agreement from ARM Limited. - */ - -#ifndef _FBDEV_WINDOW_H_ -#define _FBDEV_WINDOW_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -typedef enum -{ - FBDEV_PIXMAP_SUPPORTS_UMP = (1<<0) -} fbdev_pixmap_flags; - -typedef struct fbdev_window -{ - unsigned short width; - unsigned short height; -} fbdev_window; - -typedef struct fbdev_pixmap -{ - unsigned int height; - unsigned int width; - unsigned int bytes_per_pixel; - unsigned char buffer_size; - unsigned char red_size; - unsigned char green_size; - unsigned char blue_size; - unsigned char alpha_size; - unsigned char luminance_size; - fbdev_pixmap_flags flags; - unsigned short *data; -} fbdev_pixmap; - -#ifdef __cplusplus -} -#endif - - -#endif |