OSDN Git Service

opengl: Fix pixelDataSize() ambiguity.
authorDavid 'Digit' Turner <digit@google.com>
Thu, 27 Nov 2014 17:05:34 +0000 (18:05 +0100)
committerDavid 'Digit' Turner <digit@google.com>
Thu, 27 Nov 2014 17:05:34 +0000 (18:05 +0100)
commit0f788d82239c1a9a1922bd8fc140464058cc52e7
tree4b8a8981f074a93b5c92b25955cfdf48978bff98
parentcabeeca1127327342b83820a60498c515cc05412
opengl: Fix pixelDataSize() ambiguity.

The GLESv1 encoder library was calling the pixelDataSize() function
definition from the GLESv2 encoder library, resulting in bugs, like
the inability to see the boot animation when -gpu on is used.

This fixes the issue by using namespaces to differentiate the
two implementations. Note that the auto-generated files have been
updated by re-running update-emugl-sources.sh as specified by
opengl/README after applying the following patches:

  https://android-review.googlesource.com/#/c/116642/
  https://android-review.googlesource.com/#/c/116643/
  https://android-review.googlesource.com/#/c/116644/

Change-Id: Idbd84fb6ca5934cbb9af009b09f9a38cc4a1340a
system/GLESv1_enc/GLEncoderUtils.cpp
system/GLESv1_enc/GLEncoderUtils.h
system/GLESv1_enc/gl_enc.cpp
system/GLESv1_enc/gl_entry.cpp
system/GLESv2_enc/GL2EncoderUtils.cpp
system/GLESv2_enc/GL2EncoderUtils.h
system/GLESv2_enc/gl2_client_proc.h
system/GLESv2_enc/gl2_enc.cpp
system/GLESv2_enc/gl2_entry.cpp