From 1f9b182c7cbb0a60a9d4f952ed5762f83d20bfe7 Mon Sep 17 00:00:00 2001
From: openharmony_ci <120357966@qq.com>
Date: Tue, 16 Apr 2024 09:00:07 +0000
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=80=80=20'Pull=20Request=20!493=20:?=
=?UTF-8?q?=20=E6=96=B0=E5=A2=9Enativewindow=E6=8E=A5=E5=8F=A3'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../graphic_2d/native_buffer/native_buffer.h | 19 --------
.../native_window/external_window.h | 43 -------------------
2 files changed, 62 deletions(-)
diff --git a/graphic/graphic_2d/native_buffer/native_buffer.h b/graphic/graphic_2d/native_buffer/native_buffer.h
index 17efdb723..7c8597cde 100644
--- a/graphic/graphic_2d/native_buffer/native_buffer.h
+++ b/graphic/graphic_2d/native_buffer/native_buffer.h
@@ -58,10 +58,6 @@ enum OH_NativeBuffer_Usage {
NATIVEBUFFER_USAGE_CPU_READ = (1ULL << 0), /// < CPU read buffer */
NATIVEBUFFER_USAGE_CPU_WRITE = (1ULL << 1), /// < CPU write memory */
NATIVEBUFFER_USAGE_MEM_DMA = (1ULL << 3), /// < Direct memory access (DMA) buffer */
- NATIVEBUFFER_USAGE_HW_RENDER = (1ULL << 8), /// < For GPU write case */
- NATIVEBUFFER_USAGE_HW_TEXTURE = (1ULL << 9), /// < For GPU read case */
- NATIVEBUFFER_USAGE_CPU_READ_OFTEN = (1ULL << 16), /// < Often be mapped for direct CPU reads */
- NATIVEBUFFER_USAGE_ALIGNMENT_512 = (1ULL << 18), /// < 512 bytes alignment */
};
/**
@@ -175,21 +171,6 @@ enum OH_NativeBuffer_Format {
* @since 12
*/
NATIVEBUFFER_PIXEL_FMT_RGBA_1010102,
- /**
- * YCBCR420 semi-planar 10bit packed format
- * @since 12
- */
- NATIVEBUFFER_PIXEL_FMT_YCBCR_P010,
- /**
- * YCRCB420 semi-planar 10bit packed format
- * @since 12
- */
- NATIVEBUFFER_PIXEL_FMT_YCRCB_P010,
- /**
- * Raw 10bit packed format
- * @since 12
- */
- NATIVEBUFFER_PIXEL_FMT_RAW10,
/**
* vender mask format
* @since 12
diff --git a/graphic/graphic_2d/native_window/external_window.h b/graphic/graphic_2d/native_window/external_window.h
index 018197682..66db08561 100644
--- a/graphic/graphic_2d/native_window/external_window.h
+++ b/graphic/graphic_2d/native_window/external_window.h
@@ -229,37 +229,6 @@ typedef enum {
OH_SCALING_MODE_NO_SCALE_CROP,
} OHScalingMode;
-/**
- * @brief Indicates Scaling Mode.
- * @since 12
- */
-typedef enum {
- /**
- * the window content is not updated until a buffer of
- * the window size is received
- */
- OH_SCALING_MODE_FREEZE_V2 = 0,
- /**
- * the buffer is scaled in two dimensions to match the window size
- */
- OH_SCALING_MODE_SCALE_TO_WINDOW_V2,
- /**
- * the buffer is uniformly scaled so that the smaller size of
- * the buffer matches the window size
- */
- OH_SCALING_MODE_SCALE_CROP_V2,
- /**
- * the window is clipped to the size of the buffer's clipping rectangle
- * pixels outside the clipping rectangle are considered fully transparent.
- */
- OH_SCALING_MODE_NO_SCALE_CROP_V2,
- /**
- * Adapt to the buffer and scale proportionally to the buffer size. Prioritize displaying all buffer content.
- * If the size is not the same as the window size, fill the unfilled area of the window with a background color.
- */
- OH_SCALING_MODE_SCALE_FIT_V2,
-} OHScalingModeV2;
-
/**
* @brief Enumerates the HDR metadata keys.
* @since 9
@@ -581,18 +550,6 @@ int32_t OH_NativeWindow_GetSurfaceId(OHNativeWindow *window, uint64_t *surfaceId
* @version 1.0
*/
int32_t OH_NativeWindow_CreateNativeWindowFromSurfaceId(uint64_t surfaceId, OHNativeWindow **window);
-
-/**
- * @brief Sets scalingMode of a native window.
- *
- * @syscap SystemCapability.Graphic.Graphic2D.NativeWindow
- * @param window indicates the pointer to an OHNativeWindow instance.
- * @param scalingMode Indicates the enum value to OHScalingModeV2
- * @return Returns an error code, 0 is Success, otherwise, failed.
- * @since 12
- * @version 1.0
- */
-int32_t OH_NativeWindow_NativeWindowSetScalingMode(OHNativeWindow *window, OHScalingModeV2 scalingMode);
#ifdef __cplusplus
}
#endif
--
Gitee