diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-10-05 05:21:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-10-05 05:21:31 +0000 |
| commit | dc0912068647f594dd0e6de2447cced951811ace (patch) | |
| tree | c574e908a94b6a466e8118700cf3052d6c403d0d | |
| parent | 8b38e8b084dea39af9c48ba7a85c057eed7ed2a7 (diff) | |
| parent | 80f83656e789eb09e143db7221598ef738012049 (diff) | |
| download | device_generic_goldfish-opengl-dc0912068647f594dd0e6de2447cced951811ace.tar.gz device_generic_goldfish-opengl-dc0912068647f594dd0e6de2447cced951811ace.tar.bz2 device_generic_goldfish-opengl-dc0912068647f594dd0e6de2447cced951811ace.zip | |
Merge "Regenerate encoders"android-o-mr1-iot-release-smart-display-r3oreo-mr1-1.2-iot-release
| -rw-r--r-- | system/GLESv1_enc/gl_enc.cpp | 2 | ||||
| -rw-r--r-- | system/GLESv2_enc/gl2_enc.cpp | 5 | ||||
| -rw-r--r-- | 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 <vector> + #include <stdio.h> 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 <vector> + #include <stdio.h> 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 <vector> + #include <stdio.h> namespace { |