Bug 922810 - Part 7: extend ScopedBindTexture to support cube maps - r=jgilbert

gfx/gl/GLContext.h

@@ -3579,13 +3579,13 @@ protected:
 
 private:
     void Init(GLenum target) {
-        MOZ_ASSERT(target == LOCAL_GL_TEXTURE_2D ||
-                   target == LOCAL_GL_TEXTURE_RECTANGLE_ARB);
         mTarget = target;
         mOldTex = 0;
-        GLenum bindingTarget = (target == LOCAL_GL_TEXTURE_2D) ?
-                               LOCAL_GL_TEXTURE_BINDING_2D :
-                               LOCAL_GL_TEXTURE_BINDING_RECTANGLE_ARB;
+        GLenum bindingTarget = (target == LOCAL_GL_TEXTURE_2D) ? LOCAL_GL_TEXTURE_BINDING_2D
+                             : (target == LOCAL_GL_TEXTURE_RECTANGLE_ARB) ? LOCAL_GL_TEXTURE_BINDING_RECTANGLE_ARB
+                             : (target == LOCAL_GL_TEXTURE_CUBE_MAP) ? LOCAL_GL_TEXTURE_BINDING_CUBE_MAP
+                             : LOCAL_GL_NONE;
+        MOZ_ASSERT(bindingTarget != LOCAL_GL_NONE);
         mGL->GetUIntegerv(bindingTarget, &mOldTex);
     }