commit 77456f28ad98ee30b75b85c5f5a4a6e6bdddd870
author Jamie Madill <jmadill@chromium.org> Fri Aug 30 13:21:07 2013 -0400
committer Jamie Madill <jmadill@chromium.org> Mon Sep 09 15:27:51 2013 -0400
tree 6d4ea199827faa9e1d76e825c1f0dd7eb3e12347
parent a6da33a1ebb453e34320e5e24e9e28c0583f759a

Allow block encoders to work with a NULL pointer for the output list structure.

TRAC #23748

Signed-off-by: Nicolas Capens
Signed-off-by: Geoff Lang

src/compiler/BlockLayoutEncoder.cpp

diff --git a/src/compiler/BlockLayoutEncoder.cpp b/src/compiler/BlockLayoutEncoder.cpp
index 6d604ba..15aee6c 100644
--- a/src/compiler/BlockLayoutEncoder.cpp
+++ b/src/compiler/BlockLayoutEncoder.cpp
@@ -51,7 +51,11 @@
     getBlockLayoutInfo(field.type, field.arraySize, field.isRowMajorMatrix, &arrayStride, &matrixStride);
 
     const BlockMemberInfo memberInfo(mCurrentOffset * ComponentSize, arrayStride * ComponentSize, matrixStride * ComponentSize, field.isRowMajorMatrix);
-    mBlockInfoOut->push_back(memberInfo);
+
+    if (mBlockInfoOut)
+    {
+        mBlockInfoOut->push_back(memberInfo);
+    }
 
     advanceOffset(field.type, field.arraySize, field.isRowMajorMatrix, arrayStride, matrixStride);
 }
@@ -64,7 +68,11 @@
     getBlockLayoutInfo(type, arraySize, isRowMajorMatrix, &arrayStride, &matrixStride);
 
     const BlockMemberInfo memberInfo(mCurrentOffset * ComponentSize, arrayStride * ComponentSize, matrixStride * ComponentSize, isRowMajorMatrix);
-    mBlockInfoOut->push_back(memberInfo);
+
+    if (mBlockInfoOut)
+    {
+        mBlockInfoOut->push_back(memberInfo);
+    }
 
     advanceOffset(type, arraySize, isRowMajorMatrix, arrayStride, matrixStride);
 }