Project

General

Profile

Feature #792 ยป Move-EGL_DISPMANX_WINDOW_T-to-separate-file.diff

Patch to move EGL_DISPMANX_WINDOW_T to it's own file - Hammel, 06 Sep 2023 11:03

View differences:

host_applications/linux/libs/bcm_host/include/bcm_host.h
48 48
unsigned bcm_host_get_sdram_address(void);
49 49

  
50 50
#include "interface/vmcs_host/vc_dispmanx.h"
51
#include "interface/vmcs_host/vc_dispmanx_egl.h"
51 52
#include "interface/vmcs_host/vc_tvservice.h"
52 53
#include "interface/vmcs_host/vc_cec.h"
53 54
#include "interface/vmcs_host/vc_cecservice.h"
interface/khronos/include/EGL/eglplatform.h
107 107

  
108 108
#ifndef EGL_SERVER_SMALLINT
109 109

  
110
#include "interface/vmcs_host/vc_dispmanx.h"
111
/* TODO: EGLNativeWindowType is really one of these but I'm leaving it
112
 * as void* for now, in case changing it would cause problems
113
 */
114
typedef struct {
115
   DISPMANX_ELEMENT_HANDLE_T element;
116
   int width;   /* This is necessary because dispmanx elements are not queriable. */
117
   int height;
118
} EGL_DISPMANX_WINDOW_T;
110
#include "interface/vmcs_host/vc_dispmanx_egl.h"
111

  
119 112
#elif defined (ABSTRACT_PLATFORM)
120 113

  
121 114
#else
interface/vmcs_host/vc_dispmanx_egl.h
1
/*
2
Copyright (c) 2012, Broadcom Europe Ltd
3
All rights reserved.
4

  
5
Redistribution and use in source and binary forms, with or without
6
modification, are permitted provided that the following conditions are met:
7
    * Redistributions of source code must retain the above copyright
8
      notice, this list of conditions and the following disclaimer.
9
    * Redistributions in binary form must reproduce the above copyright
10
      notice, this list of conditions and the following disclaimer in the
11
      documentation and/or other materials provided with the distribution.
12
    * Neither the name of the copyright holder nor the
13
      names of its contributors may be used to endorse or promote products
14
      derived from this software without specific prior written permission.
15

  
16
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
17
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY
20
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26
*/
27

  
28
// Native window type for the Display manager EGL platform
29

  
30
#ifndef _VC_DISPMANX_EGL_H_
31
#define _VC_DISPMANX_EGL_H_
32

  
33
#include "interface/vmcs_host/vc_dispmanx.h"
34

  
35
typedef struct {
36
   DISPMANX_ELEMENT_HANDLE_T element;
37
   int width;   /* This is necessary because dispmanx elements are not queriable. */
38
   int height;
39
} EGL_DISPMANX_WINDOW_T;
40

  
41
#endif // _VC_DISPMANX_EGL_H_
    (1-1/1)