diff options
| author | kbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-21 00:04:46 +0000 |
|---|---|---|
| committer | kbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-21 00:04:46 +0000 |
| commit | ed41550a845dd273cbb44b433ac88f41fc09bddb (patch) | |
| tree | 7e8de9fcb33c0504b335593603f223ddb2be852b /gpu | |
| parent | a80f5ece3d46eeb0734cfca6c716d69e7ab7aaa2 (diff) | |
| download | chromium_src-ed41550a845dd273cbb44b433ac88f41fc09bddb.zip chromium_src-ed41550a845dd273cbb44b433ac88f41fc09bddb.tar.gz chromium_src-ed41550a845dd273cbb44b433ac88f41fc09bddb.tar.bz2 | |
Revert 106634 - Adjust workaround for mipmap-related OpenGL implementation bug on Mac OS X.
BUG=101105
TEST=manually ran WebGL conformance test textures/texture-mips.html on NVIDIA and AMD GPUs on Mac OS
Review URL: http://codereview.chromium.org/8365018
TBR=kbr@chromium.org
Review URL: http://codereview.chromium.org/8362019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106638 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
| -rw-r--r-- | gpu/command_buffer/service/gles2_cmd_decoder.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc index 081d371..20d97bb 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder.cc +++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc @@ -3008,11 +3008,8 @@ void GLES2DecoderImpl::DoGenerateMipmap(GLenum target) { } // Workaround for Mac driver bug. In the large scheme of things setting // glTexParamter twice for glGenerateMipmap is probably not a lage performance - // hit so there's probably no need to make this conditional. The bug appears - // to be that if the filtering mode is set to something that doesn't require - // mipmaps for rendering, or is never set to something other than the default, - // then glGenerateMipmap misbehaves. - glTexParameteri(target, GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_NEAREST); + // hit so there's probably no need to make this conditional. + glTexParameteri(target, GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_LINEAR); glGenerateMipmapEXT(target); glTexParameteri(target, GL_TEXTURE_MIN_FILTER, info->min_filter()); } |