Bug 1073036. Fix an assertion string that I forgot about.
authorJeff Muizelaar <jmuizelaar@mozilla.com>
Tue, 18 Nov 2014 10:33:36 -0500
changeset 216299 f61b87621f13953655eabd2e4c10081c0b4b2fcf
parent 216298 2f6e437218565bed30b659b1f50a40cb5b136cf5
child 216300 d696d5bfb8cf0b9f4db412d0761ce4944d9974e0
push id27845
push userkwierso@gmail.com
push dateWed, 19 Nov 2014 02:08:01 +0000
treeherdermozilla-central@64e7a6391916 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1073036
milestone36.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 1073036. Fix an assertion string that I forgot about.
gfx/layers/opengl/OGLShaderProgram.cpp
--- a/gfx/layers/opengl/OGLShaderProgram.cpp
+++ b/gfx/layers/opengl/OGLShaderProgram.cpp
@@ -543,17 +543,17 @@ ShaderProgramOGL::CreateProgram(const ch
 GLuint
 ShaderProgramOGL::GetProgram()
 {
   if (mProgramState == STATE_NEW) {
     if (!Initialize()) {
       NS_WARNING("Shader could not be initialised");
     }
   }
-  MOZ_ASSERT(HasInitialized(), "Attempting to activate a program that's not in use!");
+  MOZ_ASSERT(HasInitialized(), "Attempting to get a program that's not been initialized!");
   return mProgram;
 }
 
 void
 ShaderProgramOGL::SetBlurRadius(float aRX, float aRY)
 {
   float f[] = {aRX, aRY};
   SetUniform(KnownUniform::BlurRadius, 2, f);