Fix using sized internal formats for EGL images.

Bug b/34799114

Change-Id: Id42d3b784946291d8754774a7916a186a4694ba1
Reviewed-on: https://swiftshader-review.googlesource.com/8591
Tested-by: Nicolas Capens <capn@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>

diff --git a/src/OpenGL/common/Image.hpp b/src/OpenGL/common/Image.hpp
index 1ad5603..dbbe0dc 100644 (file)
--- a/src/OpenGL/common/Image.hpp
+++ b/src/OpenGL/common/Image.hpp
@@ -18,7 +18,7 @@
 #include "libEGL/Texture.hpp"
 #include "Renderer/Surface.hpp"
 
-#include <GLES2/gl2.h>
+#include <GLES3/gl3.h>
 #include <GLES2/gl2ext.h>
 
 #if defined(__ANDROID__)
@@ -198,10 +198,10 @@ inline GLenum GLPixelFormatFromAndroid(int halFormat)
 {
        switch(halFormat)
        {
-       case HAL_PIXEL_FORMAT_RGBA_8888: return GL_RGBA;
-       case HAL_PIXEL_FORMAT_RGBX_8888: return GL_RGB;
+       case HAL_PIXEL_FORMAT_RGBA_8888: return GL_RGBA8;
+       case HAL_PIXEL_FORMAT_RGBX_8888: return GL_RGB8;
        case HAL_PIXEL_FORMAT_RGB_888:   return GL_NONE;   // Unsupported
-       case HAL_PIXEL_FORMAT_BGRA_8888: return GL_BGRA_EXT;
+       case HAL_PIXEL_FORMAT_BGRA_8888: return GL_BGRA8_EXT;
        case HAL_PIXEL_FORMAT_RGB_565:   return GL_RGB565;
        case HAL_PIXEL_FORMAT_YV12:      return SW_YV12_BT601;
 #ifdef GRALLOC_MODULE_API_VERSION_0_2