Commit e5cea98f authored by dcastagna's avatar dcastagna Committed by Commit bot

Make NativePixmap unittests use TEXTURE_EXTERNAL_OES.

NativePixmap unittests were incorrectly using TEXTURE_2D target.

TEST='gl_unittests --gtest_also_run_disabled_tests' on samus

Review-Url: https://codereview.chromium.org/2038133004
Cr-Commit-Position: refs/heads/master@{#397857}
parent 177cc1d1
...@@ -50,7 +50,7 @@ class GLImageOzoneNativePixmapTestDelegate { ...@@ -50,7 +50,7 @@ class GLImageOzoneNativePixmapTestDelegate {
return image; return image;
} }
unsigned GetTextureTarget() const { return GL_TEXTURE_2D; } unsigned GetTextureTarget() const { return GL_TEXTURE_EXTERNAL_OES; }
const uint8_t* GetImageColor() { const uint8_t* GetImageColor() {
return format == gfx::BufferFormat::R_8 ? kRed : kGreen; return format == gfx::BufferFormat::R_8 ? kRed : kGreen;
......
...@@ -67,8 +67,8 @@ GLuint LoadFragmentShader(unsigned target, const gfx::Size& size) { ...@@ -67,8 +67,8 @@ GLuint LoadFragmentShader(unsigned target, const gfx::Size& size) {
case GL_TEXTURE_RECTANGLE_ARB: case GL_TEXTURE_RECTANGLE_ARB:
return GLHelper::LoadShader( return GLHelper::LoadShader(
GL_FRAGMENT_SHADER, GL_FRAGMENT_SHADER,
base::StringPrintf("%s\n" base::StringPrintf("#extension GL_ARB_texture_rectangle : require\n"
"#extension GL_ARB_texture_rectangle : require\n" "%s\n"
"#define SamplerType sampler2DRect\n" "#define SamplerType sampler2DRect\n"
"#define TextureLookup texture2DRect\n" "#define TextureLookup texture2DRect\n"
"#define TextureScale vec2(%f, %f)\n" "#define TextureScale vec2(%f, %f)\n"
...@@ -78,6 +78,18 @@ GLuint LoadFragmentShader(unsigned target, const gfx::Size& size) { ...@@ -78,6 +78,18 @@ GLuint LoadFragmentShader(unsigned target, const gfx::Size& size) {
static_cast<double>(size.height()), static_cast<double>(size.height()),
kFragmentShader) kFragmentShader)
.c_str()); .c_str());
case GL_TEXTURE_EXTERNAL_OES:
return GLHelper::LoadShader(
GL_FRAGMENT_SHADER,
base::StringPrintf("#extension GL_OES_EGL_image_external : require\n"
"%s\n"
"#define SamplerType samplerExternalOES\n"
"#define TextureLookup texture2D\n"
"#define TextureScale vec2(1.0, 1.0)\n"
"%s",
is_gles ? kShaderFloatPrecision : "",
kFragmentShader)
.c_str());
default: default:
NOTREACHED(); NOTREACHED();
return 0; return 0;
......
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