mozilla-central: changeset 68003:48d6abe0a436

author	Matt Woodrow <mwoodrow@mozilla.com>
	Tue, 12 Apr 2011 00:36:13 -0700
changeset 68003	48d6abe0a436
parent 68002	ce696f2e9cc9
child 68005	d03683062dcc
child 68008	e2ccb85ae5a0
push id	19467
push user	jdrew@mozilla.com
push date	2011-04-12 08:31 +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 6bcaec19d09e / 6.0a1 / 20110413030543 / files nightly linux64 6bcaec19d09e / 6.0a1 / 20110413030543 / files nightly mac 6bcaec19d09e / 6.0a1 / 20110413030543 / files nightly win32 6bcaec19d09e / 6.0a1 / 20110413030543 / files
last release without	nightly linux32 a174b86200d6 / 4.2a1pre / 20110412030535 / files nightly linux64 a174b86200d6 / 4.2a1pre / 20110412030535 / files nightly mac 09b605eb3e0d / 4.2a1pre / 20110411030525 / files nightly win32 a174b86200d6 / 4.2a1pre / 20110412030535 / files nightly win64 8618a149ea2e / 4.0b13pre / 20110321030201 / files
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()

gfx/angle/src/compiler/compilerdebug.cpp		file \| annotate \| diff \| comparison \| revisions
gfx/angle/src/compiler/compilerdebug.h		file \| annotate \| diff \| comparison \| revisions
gfx/thebes/GLContextProviderGLX.cpp		file \| annotate \| diff \| comparison \| revisions