Merge pull request #1236 from ablev-dwa/renderBufferResolve

Allow RenderBuffer::Resolve() to change the size of the image

(Internal change: 2076509)

pxr/imaging/hdx/colorizeTask.cpp

@@ -520,6 +520,12 @@ HdxColorizeTask::Execute(HdTaskContext* ctx)
         return;
     }
 
+    // Resolve the buffers before we read them.
+    _aovBuffer->Resolve();
+    if (_depthBuffer) {
+        _depthBuffer->Resolve();
+    }
+
     // Allocate the scratch space, if needed.
     size_t size = _aovBuffer->GetWidth() * _aovBuffer->GetHeight();
     if (!_applyColorQuantization && _aovName == HdAovTokens->color) {
@@ -537,12 +543,6 @@ HdxColorizeTask::Execute(HdTaskContext* ctx)
         _converged = _converged && _depthBuffer->IsConverged();
     }
 
-    // Resolve the buffers before we read them.
-    _aovBuffer->Resolve();
-    if (_depthBuffer) {
-        _depthBuffer->Resolve();
-    }
-
     // XXX: Right now, we colorize on the CPU, before uploading data to the
     // fullscreen pass.  It would be much better if the colorizer callbacks
     // were done in fragment shaders. This is particularly important for