Skip to content

S
swiftshader
Commit 0f185cfc by Nicolas Capens
Options

Fix using sized internal formats for EGL images.

Bug b/34799114 Change-Id: Id42d3b784946291d8754774a7916a186a4694ba1 Reviewed-on: https://swiftshader-review.googlesource.com/8591Tested-by: 's avatarNicolas Capens <capn@google.com> Reviewed-by: 's avatarAlexis Hétu <sugoi@google.com> Reviewed-by: 's avatarNicolas Capens <capn@google.com>
parent 411273e7
Showing with 4 additions and 4 deletions
src/OpenGL/common/Image.hpp
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#include "libEGL/Texture.hpp" #include "libEGL/Texture.hpp"
#include "Renderer/Surface.hpp" #include "Renderer/Surface.hpp"
#include <GLES2/gl2.h> #include <GLES3/gl3.h>
#include <GLES2/gl2ext.h> #include <GLES2/gl2ext.h>
#if defined(__ANDROID__) #if defined(__ANDROID__)
...@@ -198,10 +198,10 @@ inline GLenum GLPixelFormatFromAndroid(int halFormat) ...@@ -198,10 +198,10 @@ inline GLenum GLPixelFormatFromAndroid(int halFormat)
{ {
switch(halFormat) switch(halFormat)
{ {
case HAL_PIXEL_FORMAT_RGBA_8888: return GL_RGBA; case HAL_PIXEL_FORMAT_RGBA_8888: return GL_RGBA8;
case HAL_PIXEL_FORMAT_RGBX_8888: return GL_RGB; case HAL_PIXEL_FORMAT_RGBX_8888: return GL_RGB8;
case HAL_PIXEL_FORMAT_RGB_888: return GL_NONE; // Unsupported 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_RGB_565: return GL_RGB565;
case HAL_PIXEL_FORMAT_YV12: return SW_YV12_BT601; case HAL_PIXEL_FORMAT_YV12: return SW_YV12_BT601;
#ifdef GRALLOC_MODULE_API_VERSION_0_2 #ifdef GRALLOC_MODULE_API_VERSION_0_2
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment