From e1419c1b3099898d388f05fb52d3908cfb978051 Mon Sep 17 00:00:00 2001 From: "backer@chromium.org" Date: Fri, 12 Aug 2011 14:48:50 +0000 Subject: Make texture mapping OpenGL ES 2.0 compliant. According to 3.8.2 of the spec, we need to CLAMP_TO_EDGE and use either NEAREST or LINEAR. Otherwise, the fragment shader is supposed to draw black when texture mapping. BUG=none TEST=run TOUCH_UI build on compliant OpenGL ES driver --> screen should display Review URL: http://codereview.chromium.org/7637011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96555 0039d316-1c4b-4281-b951-d872f2087c98 --- ui/gfx/compositor/compositor_gl.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ui/gfx/compositor/compositor_gl.cc b/ui/gfx/compositor/compositor_gl.cc index 6e1e651..b5937ef 100644 --- a/ui/gfx/compositor/compositor_gl.cc +++ b/ui/gfx/compositor/compositor_gl.cc @@ -316,6 +316,8 @@ void TextureGL::SetCanvas(const SkCanvas& canvas, glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); } else if (size_ != overall_size) { // Size has changed. size_ = overall_size; glBindTexture(GL_TEXTURE_2D, texture_id_); -- cgit v1.1