Bug 1136508 - Build fixes.
authorJeff Gilbert <jgilbert@mozilla.com>
Wed, 13 Jul 2016 02:25:18 -0700
changeset 304887 32c9064317103475b50b7bb21fb00b32141480c5
parent 304886 bdfafe991ec6c58dd08924b2fdf388876b08e80a
child 304888 da8a989f65d1f4883f174bf07dff099104e7b3d4
push id79446
push userjgilbert@mozilla.com
push dateWed, 13 Jul 2016 18:59:50 +0000
treeherdermozilla-inbound@da8a989f65d1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1136508
milestone50.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 1136508 - Build fixes. MozReview-Commit-ID: 15ONcukMzHz
dom/canvas/WebGLTextureUpload.cpp
--- a/dom/canvas/WebGLTextureUpload.cpp
+++ b/dom/canvas/WebGLTextureUpload.cpp
@@ -1919,17 +1919,17 @@ WebGLTexture::ValidateCopyTexImageForFee
     const auto& fb = mContext->mBoundReadFramebuffer;
     if (fb) {
         const auto readBuffer = fb->ReadBufferMode();
         MOZ_ASSERT(readBuffer != LOCAL_GL_NONE);
         const uint32_t colorAttachment = readBuffer - LOCAL_GL_COLOR_ATTACHMENT0;
         const auto& attach = fb->ColorAttachment(colorAttachment);
 
         if (attach.Texture() == this &&
-            attach.MipLevel() == uint32_t(level))
+            uint32_t(attach.MipLevel()) == level)
         {
             // Note that the TexImageTargets *don't* have to match for this to be
             // undefined per GLES 3.0.4 p211, thus an INVALID_OP in WebGL.
             mContext->ErrorInvalidOperation("%s: Feedback loop detected, as this texture"
                                             " is already attached to READ_FRAMEBUFFER's"
                                             " READ_BUFFER-selected COLOR_ATTACHMENT%u.",
                                             funcName, colorAttachment);
             return false;