Bug 1240867 - Fix non-unified build bustage in OGLShaderProgram.cpp. r=nical
authorKartikaya Gupta <kgupta@mozilla.com>
Wed, 20 Jan 2016 09:58:17 -0500
changeset 317779 b7b536914defdbe3e7a25ee081ba708c5077020b
parent 317778 e9b03a12ce6d0c8d540b204ed77403e554f916b5
child 317780 655280c526b76cb70b7b7c2f64acd10348401a54
push id1079
push userjlund@mozilla.com
push dateFri, 15 Apr 2016 21:02:33 +0000
treeherdermozilla-release@575fbf6786d5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnical
bugs1240867
milestone46.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1240867 - Fix non-unified build bustage in OGLShaderProgram.cpp. r=nical
gfx/layers/opengl/OGLShaderProgram.cpp
--- a/gfx/layers/opengl/OGLShaderProgram.cpp
+++ b/gfx/layers/opengl/OGLShaderProgram.cpp
@@ -3,16 +3,17 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "OGLShaderProgram.h"
 #include <stdint.h>                     // for uint32_t
 #include <sstream>                      // for ostringstream
 #include "gfxEnv.h"
 #include "gfxRect.h"                    // for gfxRect
 #include "mozilla/DebugOnly.h"          // for DebugOnly
+#include "mozilla/layers/Compositor.h"  // for BlendOpIsMixBlendMode
 #include "nsAString.h"
 #include "nsAutoPtr.h"                  // for nsRefPtr
 #include "nsString.h"                   // for nsAutoCString
 #include "Layers.h"
 #include "GLContext.h"
 
 namespace mozilla {
 namespace layers {
@@ -157,30 +158,30 @@ ShaderConfigOGL::SetNoPremultipliedAlpha
 
 void
 ShaderConfigOGL::SetDEAA(bool aEnabled)
 {
   SetFeature(ENABLE_DEAA, aEnabled);
 }
 
 void
-ShaderConfigOGL::SetCompositionOp(CompositionOp aOp)
+ShaderConfigOGL::SetCompositionOp(gfx::CompositionOp aOp)
 {
   mCompositionOp = aOp;
 }
 
 /* static */ ProgramProfileOGL
 ProgramProfileOGL::GetProfileFor(ShaderConfigOGL aConfig)
 {
   ProgramProfileOGL result;
   ostringstream fs, vs;
 
   AddUniforms(result);
 
-  CompositionOp blendOp = aConfig.mCompositionOp;
+  gfx::CompositionOp blendOp = aConfig.mCompositionOp;
 
   vs << "#ifdef GL_ES" << endl;
   vs << "#define EDGE_PRECISION mediump" << endl;
   vs << "#else" << endl;
   vs << "#define EDGE_PRECISION" << endl;
   vs << "#endif" << endl;
   vs << "uniform mat4 uMatrixProj;" << endl;
   vs << "uniform vec4 uLayerRects[4];" << endl;