author | Matt Woodrow <mwoodrow@mozilla.com> |
Tue, 12 Apr 2011 00:36:13 -0700 | |
changeset 68003 | 48d6abe0a436684ba33e958303d27426480a27ba |
parent 68002 | ce696f2e9cc979c40c128f9cd3cace3d7f51b3c1 |
child 68005 | d03683062dccae6e3e7f2dcbdedacb94f178b93d |
child 68008 | e2ccb85ae5a0a6c5b9b44988b7f55cc0f6c3990c |
push id | 19467 |
push user | jdrew@mozilla.com |
push date | Tue, 12 Apr 2011 08:31:49 +0000 |
treeherder | mozilla-central@48d6abe0a436 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | bjacob |
bugs | 640082 |
milestone | 2.2a1pre |
first release with | nightly win64
48d6abe0a436
/
4.2a1pre
/
20110412030204
/
files
nightly linux32
nightly linux64
nightly mac
nightly win32
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
releases | nightly win64
4.2a1pre
/
20110412030204
/
pushlog to previous
|
--- a/gfx/thebes/GLContextProviderGLX.cpp +++ b/gfx/thebes/GLContextProviderGLX.cpp @@ -590,17 +590,17 @@ public: return true; } virtual void BindTexture(GLenum aTextureUnit) { mGLContext->fActiveTexture(aTextureUnit); mGLContext->fBindTexture(LOCAL_GL_TEXTURE_2D, Texture()); sGLXLibrary.BindTexImage(mPixmap); - mGLContext->fActiveTexture(LOCAL_GL_TEXTURE); + mGLContext->fActiveTexture(LOCAL_GL_TEXTURE0); } virtual void ReleaseTexture() { sGLXLibrary.ReleaseTexImage(mPixmap); } virtual already_AddRefed<gfxASurface> GetBackingSurface()