From 80f83656e789eb09e143db7221598ef738012049 Mon Sep 17 00:00:00 2001 From: Roman Kiryanov Date: Wed, 3 Oct 2018 14:05:29 -0700 Subject: Regenerate encoders ./android/android-emugl/scripts/update-emugl-sources.sh --aosp-dir=/usr/local/google/home/rkir/repo-aosp-master Bug: 116046430 Test: make -j Change-Id: If12222a4b5f96475cb3c1edcf461d216a4ac6584 Signed-off-by: Roman Kiryanov --- system/GLESv1_enc/gl_enc.cpp | 2 ++ system/GLESv2_enc/gl2_enc.cpp | 5 +++-- system/renderControl_enc/renderControl_enc.cpp | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/system/GLESv1_enc/gl_enc.cpp b/system/GLESv1_enc/gl_enc.cpp index 79df3d70..31c1269a 100644 --- a/system/GLESv1_enc/gl_enc.cpp +++ b/system/GLESv1_enc/gl_enc.cpp @@ -8,6 +8,8 @@ #include "gl_enc.h" +#include + #include namespace { diff --git a/system/GLESv2_enc/gl2_enc.cpp b/system/GLESv2_enc/gl2_enc.cpp index f42e7ba3..ffffa499 100644 --- a/system/GLESv2_enc/gl2_enc.cpp +++ b/system/GLESv2_enc/gl2_enc.cpp @@ -8,6 +8,8 @@ #include "gl2_enc.h" +#include + #include namespace { @@ -3028,8 +3030,7 @@ void glReadPixels_enc(void *self , GLint x, GLint y, GLsizei width, GLsizei heig if (useChecksum) checksumCalculator->addBuffer(buf, ptr-buf); if (useChecksum) checksumCalculator->writeChecksum(ptr, checksumSize); ptr += checksumSize; - // TODO: make this part of autogenerated pipe code. - // b/79208762 + // TODO: emugen produces bad code here, see b/79208762 stream->readbackPixels(self, width, height, format, type, pixels); if (useChecksum) checksumCalculator->addBuffer(pixels, __size_pixels); diff --git a/system/renderControl_enc/renderControl_enc.cpp b/system/renderControl_enc/renderControl_enc.cpp index e22d7c02..f250926a 100644 --- a/system/renderControl_enc/renderControl_enc.cpp +++ b/system/renderControl_enc/renderControl_enc.cpp @@ -8,6 +8,8 @@ #include "renderControl_enc.h" +#include + #include namespace { -- cgit v1.2.3