summaryrefslogtreecommitdiff
path: root/native
diff options
context:
space:
mode:
authorBo Liu <boliu@google.com>2019-03-24 08:26:11 -0400
committerBo Liu <boliu@google.com>2019-03-25 09:34:27 -0400
commitd336f5d95fb4a0edead0476e5623377e4c1ec4a6 (patch)
tree68f502f314f6f7492412e68a54f849e35225a028 /native
parent4b58630ef2d5fd776bb393b07fcd61e51063774d (diff)
Deprecate is_layer for vulkan functor
Webview no longer needs this. Bug: 124123583 Test: comppiles and vulkan webview in layer keeps working Change-Id: Ib54e33649eb027a03184c5d7588cfd9568c90a6c
Diffstat (limited to 'native')
-rw-r--r--native/webview/plat_support/draw_fn.h22
-rw-r--r--native/webview/plat_support/draw_functor.cpp4
2 files changed, 5 insertions, 21 deletions
diff --git a/native/webview/plat_support/draw_fn.h b/native/webview/plat_support/draw_fn.h
index 5b3e496be81a..42cad43af8fc 100644
--- a/native/webview/plat_support/draw_fn.h
+++ b/native/webview/plat_support/draw_fn.h
@@ -44,23 +44,8 @@ struct AwDrawFn_DrawGLParams {
int width;
int height;
- // Input: is the View rendered into an independent layer.
- // If false, the surface is likely to hold to the full screen contents, with
- // the scissor box set by the caller to the actual View location and size.
- // Also the transformation matrix will contain at least a translation to the
- // position of the View to render, plus any other transformations required as
- // part of any ongoing View animation. View translucency (alpha) is ignored,
- // although the framework will set is_layer to true for non-opaque cases.
- // Can be requested via the View.setLayerType(View.LAYER_TYPE_NONE, ...)
- // Android API method.
- //
- // If true, the surface is dedicated to the View and should have its size.
- // The viewport and scissor box are set by the caller to the whole surface.
- // Animation transformations are handled by the caller and not reflected in
- // the provided transformation matrix. Translucency works normally.
- // Can be requested via the View.setLayerType(View.LAYER_TYPE_HARDWARE, ...)
- // Android API method.
- bool is_layer;
+ // Used to be is_layer.
+ bool deprecated_0;
// Input: current transformation matrix in surface pixels.
// Uses the column-based OpenGL matrix format.
@@ -102,8 +87,7 @@ struct AwDrawFn_DrawVkParams {
int width;
int height;
- // Input: is the render target a FBO
- bool is_layer;
+ bool deprecated_0;
// Input: current transform matrix
float transform[16];
diff --git a/native/webview/plat_support/draw_functor.cpp b/native/webview/plat_support/draw_functor.cpp
index e43a60c3f396..7cce61b87d12 100644
--- a/native/webview/plat_support/draw_functor.cpp
+++ b/native/webview/plat_support/draw_functor.cpp
@@ -65,7 +65,7 @@ void draw_gl(int functor, void* data,
.clip_bottom = draw_gl_params.clipBottom,
.width = draw_gl_params.width,
.height = draw_gl_params.height,
- .is_layer = draw_gl_params.isLayer,
+ .deprecated_0 = false,
.transfer_function_g = gabcdef[0],
.transfer_function_a = gabcdef[1],
.transfer_function_b = gabcdef[2],
@@ -126,7 +126,7 @@ void drawVk(int functor, void* data, const uirenderer::VkFunctorDrawParams& draw
.version = kAwDrawFnVersion,
.width = draw_vk_params.width,
.height = draw_vk_params.height,
- .is_layer = draw_vk_params.is_layer,
+ .deprecated_0 = false,
.secondary_command_buffer = draw_vk_params.secondary_command_buffer,
.color_attachment_index = draw_vk_params.color_attachment_index,
.compatible_render_pass = draw_vk_params.compatible_render_pass,