Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 58a79f47 authored by Mathias Agopian's avatar Mathias Agopian
Browse files

move android_native_buffer_t declaration into its own... 

move android_native_buffer_t declaration into its own private/ui/android_native_priv.h header, since user code should never have access to it.
parent 7189c005

include/private/ui/SurfaceBuffer.h

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 


#include <utils/RefBase.h>



#include <ui/egl/android_natives.h>

#include <private/ui/android_natives_priv.h>



namespace android {

include/private/ui/android_natives_priv.h

0 → 100644
+62 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2009 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 ANDROID_ANDROID_NATIVES_PRIV_H

#define ANDROID_ANDROID_NATIVES_PRIV_H



#include <ui/egl/android_natives.h>



#ifdef __cplusplus

extern "C" {

#endif



/*****************************************************************************/



struct android_native_buffer_t

{

#ifdef __cplusplus

    android_native_buffer_t() { 

        common.magic = ANDROID_NATIVE_BUFFER_MAGIC;

        common.version = sizeof(android_native_buffer_t);

        memset(common.reserved, 0, sizeof(common.reserved));

    }

#endif



    struct android_native_base_t common;



    int width;

    int height;

    int stride;

    int format;

    int usage;

    

    void* reserved[2];



    buffer_handle_t handle;



    void* reserved_proc[8];

};





/*****************************************************************************/



#ifdef __cplusplus

}

#endif



/*****************************************************************************/



#endif /* ANDROID_ANDROID_NATIVES_PRIV_H */

include/ui/egl/android_natives.h

+0 −26
Original line number Diff line number Diff line
@@ -139,32 +139,6 @@ struct android_native_window_t 
};





struct android_native_buffer_t

{

#ifdef __cplusplus

    android_native_buffer_t() { 

        common.magic = ANDROID_NATIVE_BUFFER_MAGIC;

        common.version = sizeof(android_native_buffer_t);

        memset(common.reserved, 0, sizeof(common.reserved));

    }

#endif



    struct android_native_base_t common;



    int width;

    int height;

    int stride;

    int format;

    int usage;

    

    void* reserved[2];



    buffer_handle_t handle;



    void* reserved_proc[8];

};





/* FIXME: this is legacy for pixmaps */

struct egl_native_pixmap_t

{

libs/ui/FramebufferNativeWindow.cpp

+2 −0
Original line number Diff line number Diff line
@@ -38,6 +38,8 @@ 
#include <hardware/hardware.h>

#include <hardware/gralloc.h>



#include <private/ui/android_natives_priv.h>



// ----------------------------------------------------------------------------

namespace android {

// ----------------------------------------------------------------------------

opengl/libagl/TextureObjectManager.cpp

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#include "context.h"

#include "TextureObjectManager.h"



#include <ui/egl/android_natives.h>

#include <private/ui/android_natives_priv.h>



namespace android {

// ----------------------------------------------------------------------------