|
@@ -65,7 +65,7 @@ index 78a6b5739caed8c3925f303c52ed107be8e4ccfe..ddbf660e594c1a991d4e758fa11b1b2e
|
|
|
!command_line->HasSwitch(switches::kUIDisablePartialSwap);
|
|
|
#if defined(OS_WIN)
|
|
|
diff --git a/components/viz/service/display/gl_renderer.cc b/components/viz/service/display/gl_renderer.cc
|
|
|
-index b7a65f6dae8f2fcba0ba127cb50f0f338a26b9d0..bc1d0d3dd92d1adc6c94803755a23c28ff47771a 100644
|
|
|
+index 3b93c6b3a41d0dd5174b2acb15fe4f3d1714e4d4..a8de22d3f29d5e290af1c5612e666b459800aa0f 100644
|
|
|
--- a/components/viz/service/display/gl_renderer.cc
|
|
|
+++ b/components/viz/service/display/gl_renderer.cc
|
|
|
@@ -80,6 +80,9 @@
|
|
@@ -90,7 +90,7 @@ index b7a65f6dae8f2fcba0ba127cb50f0f338a26b9d0..bc1d0d3dd92d1adc6c94803755a23c28
|
|
|
|
|
|
// Use the full quad_rect for debug quads to not move the edges based on
|
|
|
// partial swaps.
|
|
|
-@@ -1353,7 +1357,8 @@ void GLRenderer::ChooseRPDQProgram(DrawRenderPassDrawQuadParams* params,
|
|
|
+@@ -1335,7 +1339,8 @@ void GLRenderer::ChooseRPDQProgram(DrawRenderPassDrawQuadParams* params,
|
|
|
params->use_aa ? USE_AA : NO_AA, mask_mode, mask_for_background,
|
|
|
params->use_color_matrix, tint_gl_composited_content_,
|
|
|
ShouldApplyRoundedCorner(params->quad)),
|
|
@@ -100,7 +100,7 @@ index b7a65f6dae8f2fcba0ba127cb50f0f338a26b9d0..bc1d0d3dd92d1adc6c94803755a23c28
|
|
|
}
|
|
|
|
|
|
void GLRenderer::UpdateRPDQUniforms(DrawRenderPassDrawQuadParams* params) {
|
|
|
-@@ -1824,8 +1829,8 @@ void GLRenderer::DrawSolidColorQuad(const SolidColorDrawQuad* quad,
|
|
|
+@@ -1806,8 +1811,8 @@ void GLRenderer::DrawSolidColorQuad(const SolidColorDrawQuad* quad,
|
|
|
SetUseProgram(ProgramKey::SolidColor(use_aa ? USE_AA : NO_AA,
|
|
|
tint_gl_composited_content_,
|
|
|
ShouldApplyRoundedCorner(quad)),
|
|
@@ -111,7 +111,7 @@ index b7a65f6dae8f2fcba0ba127cb50f0f338a26b9d0..bc1d0d3dd92d1adc6c94803755a23c28
|
|
|
SetShaderColor(color, opacity);
|
|
|
if (current_program_->rounded_corner_rect_location() != -1) {
|
|
|
SetShaderRoundedCorner(
|
|
|
-@@ -1980,8 +1985,8 @@ void GLRenderer::DrawContentQuadAA(const ContentDrawQuadBase* quad,
|
|
|
+@@ -1962,8 +1967,8 @@ void GLRenderer::DrawContentQuadAA(const ContentDrawQuadBase* quad,
|
|
|
: NON_PREMULTIPLIED_ALPHA,
|
|
|
false, false, tint_gl_composited_content_,
|
|
|
ShouldApplyRoundedCorner(quad)),
|
|
@@ -122,7 +122,7 @@ index b7a65f6dae8f2fcba0ba127cb50f0f338a26b9d0..bc1d0d3dd92d1adc6c94803755a23c28
|
|
|
|
|
|
if (current_program_->tint_color_matrix_location() != -1) {
|
|
|
auto matrix = cc::DebugColors::TintCompositedContentColorTransformMatrix();
|
|
|
-@@ -2077,8 +2082,8 @@ void GLRenderer::DrawContentQuadNoAA(const ContentDrawQuadBase* quad,
|
|
|
+@@ -2059,8 +2064,8 @@ void GLRenderer::DrawContentQuadNoAA(const ContentDrawQuadBase* quad,
|
|
|
!quad->ShouldDrawWithBlending(), has_tex_clamp_rect,
|
|
|
tint_gl_composited_content_,
|
|
|
ShouldApplyRoundedCorner(quad)),
|
|
@@ -133,7 +133,7 @@ index b7a65f6dae8f2fcba0ba127cb50f0f338a26b9d0..bc1d0d3dd92d1adc6c94803755a23c28
|
|
|
|
|
|
if (current_program_->tint_color_matrix_location() != -1) {
|
|
|
auto matrix = cc::DebugColors::TintCompositedContentColorTransformMatrix();
|
|
|
-@@ -2181,7 +2186,7 @@ void GLRenderer::DrawYUVVideoQuad(const YUVVideoDrawQuad* quad,
|
|
|
+@@ -2163,7 +2168,7 @@ void GLRenderer::DrawYUVVideoQuad(const YUVVideoDrawQuad* quad,
|
|
|
DCHECK_NE(src_color_space, src_color_space.GetAsFullRangeRGB());
|
|
|
|
|
|
gfx::ColorSpace dst_color_space =
|
|
@@ -142,7 +142,7 @@ index b7a65f6dae8f2fcba0ba127cb50f0f338a26b9d0..bc1d0d3dd92d1adc6c94803755a23c28
|
|
|
// Force sRGB output on Windows for overlay candidate video quads to match
|
|
|
// DirectComposition behavior in case these switch between overlays and
|
|
|
// compositing. See https://crbug.com/811118 for details.
|
|
|
-@@ -2337,8 +2342,8 @@ void GLRenderer::DrawStreamVideoQuad(const StreamVideoDrawQuad* quad,
|
|
|
+@@ -2319,8 +2324,8 @@ void GLRenderer::DrawStreamVideoQuad(const StreamVideoDrawQuad* quad,
|
|
|
|
|
|
SetUseProgram(ProgramKey::VideoStream(tex_coord_precision,
|
|
|
ShouldApplyRoundedCorner(quad)),
|
|
@@ -153,7 +153,7 @@ index b7a65f6dae8f2fcba0ba127cb50f0f338a26b9d0..bc1d0d3dd92d1adc6c94803755a23c28
|
|
|
|
|
|
DCHECK_EQ(GL_TEXTURE0, GetActiveTextureUnit(gl_));
|
|
|
gl_->BindTexture(GL_TEXTURE_EXTERNAL_OES, lock.texture_id());
|
|
|
-@@ -2395,8 +2400,8 @@ void GLRenderer::FlushTextureQuadCache(BoundGeometry flush_binding) {
|
|
|
+@@ -2377,8 +2382,8 @@ void GLRenderer::FlushTextureQuadCache(BoundGeometry flush_binding) {
|
|
|
draw_cache_.nearest_neighbor ? GL_NEAREST : GL_LINEAR);
|
|
|
|
|
|
// Bind the program to the GL state.
|
|
@@ -164,7 +164,7 @@ index b7a65f6dae8f2fcba0ba127cb50f0f338a26b9d0..bc1d0d3dd92d1adc6c94803755a23c28
|
|
|
|
|
|
if (current_program_->rounded_corner_rect_location() != -1) {
|
|
|
SetShaderRoundedCorner(
|
|
|
-@@ -3089,7 +3094,9 @@ void GLRenderer::PrepareGeometry(BoundGeometry binding) {
|
|
|
+@@ -3071,7 +3076,9 @@ void GLRenderer::PrepareGeometry(BoundGeometry binding) {
|
|
|
void GLRenderer::SetUseProgram(const ProgramKey& program_key_no_color,
|
|
|
const gfx::ColorSpace& src_color_space,
|
|
|
const gfx::ColorSpace& dst_color_space) {
|
|
@@ -175,7 +175,7 @@ index b7a65f6dae8f2fcba0ba127cb50f0f338a26b9d0..bc1d0d3dd92d1adc6c94803755a23c28
|
|
|
|
|
|
ProgramKey program_key = program_key_no_color;
|
|
|
const gfx::ColorTransform* color_transform =
|
|
|
-@@ -3443,7 +3450,7 @@ void GLRenderer::CopyRenderPassDrawQuadToOverlayResource(
|
|
|
+@@ -3425,7 +3432,7 @@ void GLRenderer::CopyRenderPassDrawQuadToOverlayResource(
|
|
|
|
|
|
*overlay_texture = FindOrCreateOverlayTexture(
|
|
|
params.quad->render_pass_id, iosurface_width, iosurface_height,
|
|
@@ -184,7 +184,7 @@ index b7a65f6dae8f2fcba0ba127cb50f0f338a26b9d0..bc1d0d3dd92d1adc6c94803755a23c28
|
|
|
*new_bounds = gfx::RectF(updated_dst_rect.origin(),
|
|
|
gfx::SizeF((*overlay_texture)->texture.size()));
|
|
|
|
|
|
-@@ -3647,8 +3654,9 @@ void GLRenderer::FlushOverdrawFeedback(const gfx::Rect& output_rect) {
|
|
|
+@@ -3629,8 +3636,9 @@ void GLRenderer::FlushOverdrawFeedback(const gfx::Rect& output_rect) {
|
|
|
|
|
|
PrepareGeometry(SHARED_BINDING);
|
|
|
|
|
@@ -196,7 +196,7 @@ index b7a65f6dae8f2fcba0ba127cb50f0f338a26b9d0..bc1d0d3dd92d1adc6c94803755a23c28
|
|
|
|
|
|
gfx::Transform render_matrix;
|
|
|
render_matrix.Translate(0.5 * output_rect.width() + output_rect.x(),
|
|
|
-@@ -3808,3 +3816,5 @@ gfx::Size GLRenderer::GetRenderPassBackingPixelSize(
|
|
|
+@@ -3790,3 +3798,5 @@ gfx::Size GLRenderer::GetRenderPassBackingPixelSize(
|
|
|
}
|
|
|
|
|
|
} // namespace viz
|