openharmony/graphic_graphic_2d
1
0
Fork 0
mirror of https://gitee.com/openharmony/graphic_graphic_2d synced 2024-12-22 23:00:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Modify the ndk interface name of NativeWindow

Browse Source 
Signed-off-by: yexiandong <yexiandong@huawei.com>
This commit is contained in:
yexiandong 2022-02-07 14:33:40 +08:00
parent 5c877854e1
commit 4c559ebc00
3 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
frameworks/surface/src/native_window.cpp
View File

@ -299,15 +299,15 @@ NativeWindowBuffer::NativeWindowBuffer() : NativeWindowMagic(NATIVE_OBJECT_MAGIC
BLOGD("NativeWindowBuffer %p", this);
}
weak_alias(CreateNativeWindowFromSurface, OH_NATIVE_WINDOW_CreateNativeWindowFromSurface);
weak_alias(DestoryNativeWindow, OH_NATIVE_WINDOW_DestoryNativeWindow);
weak_alias(CreateNativeWindowBufferFromSurfaceBuffer, OH_NATIVE_WINDOW_CreateNativeWindowBufferFromSurfaceBuffer);
weak_alias(DestoryNativeWindowBuffer, OH_NATIVE_WINDOW_DestoryNativeWindowBuffer);
weak_alias(NativeWindowRequestBuffer, OH_NATIVE_WINDOW_NativeWindowRequestBuffer);
weak_alias(NativeWindowFlushBuffer, OH_NATIVE_WINDOW_NativeWindowFlushBuffer);
weak_alias(NativeWindowCancelBuffer, OH_NATIVE_WINDOW_NativeWindowCancelBuffer);
weak_alias(NativeWindowHandleOpt, OH_NATIVE_WINDOW_NativeWindowHandleOpt);
weak_alias(GetBufferHandleFromNative, OH_NATIVE_WINDOW_GetBufferHandleFromNative);
weak_alias(NativeObjectReference, OH_NATIVE_WINDOW_NativeObjectReference);
weak_alias(NativeObjectUnreference, OH_NATIVE_WINDOW_NativeObjectUnreference);
weak_alias(GetNativeObjectMagic, OH_NATIVE_WINDOW_GetNativeObjectMagic);
weak_alias(CreateNativeWindowFromSurface, OH_NativeWindow_CreateNativeWindowFromSurface);
weak_alias(DestoryNativeWindow, OH_NativeWindow_DestoryNativeWindow);
weak_alias(CreateNativeWindowBufferFromSurfaceBuffer, OH_NativeWindow_CreateNativeWindowBufferFromSurfaceBuffer);
weak_alias(DestoryNativeWindowBuffer, OH_NativeWindow_DestoryNativeWindowBuffer);
weak_alias(NativeWindowRequestBuffer, OH_NativeWindow_NativeWindowRequestBuffer);
weak_alias(NativeWindowFlushBuffer, OH_NativeWindow_NativeWindowFlushBuffer);
weak_alias(NativeWindowCancelBuffer, OH_NativeWindow_NativeWindowCancelBuffer);
weak_alias(NativeWindowHandleOpt, OH_NativeWindow_NativeWindowHandleOpt);
weak_alias(GetBufferHandleFromNative, OH_NativeWindow_GetBufferHandleFromNative);
weak_alias(NativeObjectReference, OH_NativeWindow_NativeObjectReference);
weak_alias(NativeObjectUnreference, OH_NativeWindow_NativeObjectUnreference);
weak_alias(GetNativeObjectMagic, OH_NativeWindow_GetNativeObjectMagic);

24
interfaces/innerkits/surface/external_window.h
View File

@ -22,25 +22,25 @@
extern "C" {
#endif
struct NativeWindow* OH_NATIVE_WINDOW_CreateNativeWindowFromSurface(void* pSurface);
void OH_NATIVE_WINDOW_DestoryNativeWindow(struct NativeWindow* window);
struct NativeWindow* OH_NativeWindow_CreateNativeWindowFromSurface(void* pSurface);
void OH_NativeWindow_DestoryNativeWindow(struct NativeWindow* window);
struct NativeWindowBuffer* OH_NATIVE_WINDOW_CreateNativeWindowBufferFromSurfaceBuffer(void* pSurfaceBuffer);
void OH_NATIVE_WINDOW_DestoryNativeWindowBuffer(struct NativeWindowBuffer* buffer);
struct NativeWindowBuffer* OH_NativeWindow_CreateNativeWindowBufferFromSurfaceBuffer(void* pSurfaceBuffer);
void OH_NativeWindow_DestoryNativeWindowBuffer(struct NativeWindowBuffer* buffer);
int32_t OH_NATIVE_WINDOW_NativeWindowRequestBuffer(struct NativeWindow *window,
int32_t OH_NativeWindow_NativeWindowRequestBuffer(struct NativeWindow *window,
/* [out] */ struct NativeWindowBuffer **buffer,
/* [out] get release fence */ int *fenceFd);
int32_t OH_NATIVE_WINDOW_NativeWindowFlushBuffer(struct NativeWindow *window, struct NativeWindowBuffer *buffer,
int32_t OH_NativeWindow_NativeWindowFlushBuffer(struct NativeWindow *window, struct NativeWindowBuffer *buffer,
int fenceFd, Region region);
int32_t OH_NATIVE_WINDOW_NativeWindowCancelBuffer(struct NativeWindow *window, struct NativeWindowBuffer *buffer);
int32_t OH_NativeWindow_NativeWindowCancelBuffer(struct NativeWindow *window, struct NativeWindowBuffer *buffer);
int32_t OH_NATIVE_WINDOW_NativeWindowHandleOpt(struct NativeWindow *window, int code, ...);
BufferHandle *OH_NATIVE_WINDOW_GetBufferHandleFromNative(struct NativeWindowBuffer *buffer);
int32_t OH_NativeWindow_NativeWindowHandleOpt(struct NativeWindow *window, int code, ...);
BufferHandle *OH_NativeWindow_GetBufferHandleFromNative(struct NativeWindowBuffer *buffer);
int32_t OH_NATIVE_WINDOW_NativeObjectReference(void *obj);
int32_t OH_NATIVE_WINDOW_NativeObjectUnreference(void *obj);
int32_t OH_NATIVE_WINDOW_GetNativeObjectMagic(void *obj);
int32_t OH_NativeWindow_NativeObjectReference(void *obj);
int32_t OH_NativeWindow_NativeObjectUnreference(void *obj);
int32_t OH_NativeWindow_GetNativeObjectMagic(void *obj);
#ifdef __cplusplus
}

24
interfaces/kits/ndk/native_window/libnative_window.ndk.json
View File

@ -1,14 +1,14 @@
[
{ "name": "OH_NATIVE_WINDOW_CreateNativeWindowFromSurface" },
{ "name": "OH_NATIVE_WINDOW_DestoryNativeWindow" },
{ "name": "OH_NATIVE_WINDOW_CreateNativeWindowBufferFromSurfaceBuffer" },
{ "name": "OH_NATIVE_WINDOW_DestoryNativeWindowBuffer" },
{ "name": "OH_NATIVE_WINDOW_NativeWindowRequestBuffer" },
{ "name": "OH_NATIVE_WINDOW_NativeWindowFlushBuffer" },
{ "name": "OH_NATIVE_WINDOW_NativeWindowCancelBuffer" },
{ "name": "OH_NATIVE_WINDOW_NativeWindowHandleOpt" },
{ "name": "OH_NATIVE_WINDOW_GetBufferHandleFromNative" },
{ "name": "OH_NATIVE_WINDOW_NativeObjectReference" },
{ "name": "OH_NATIVE_WINDOW_NativeObjectUnreference" },
{ "name": "OH_NATIVE_WINDOW_GetNativeObjectMagic" }
{ "name": "OH_NativeWindow_CreateNativeWindowFromSurface" },
{ "name": "OH_NativeWindow_DestoryNativeWindow" },
{ "name": "OH_NativeWindow_CreateNativeWindowBufferFromSurfaceBuffer" },
{ "name": "OH_NativeWindow_DestoryNativeWindowBuffer" },
{ "name": "OH_NativeWindow_NativeWindowRequestBuffer" },
{ "name": "OH_NativeWindow_NativeWindowFlushBuffer" },
{ "name": "OH_NativeWindow_NativeWindowCancelBuffer" },
{ "name": "OH_NativeWindow_NativeWindowHandleOpt" },
{ "name": "OH_NativeWindow_GetBufferHandleFromNative" },
{ "name": "OH_NativeWindow_NativeObjectReference" },
{ "name": "OH_NativeWindow_NativeObjectUnreference" },
{ "name": "OH_NativeWindow_GetNativeObjectMagic" }
]