commit 04ea03e4e1e1575ee576dafe1793f15fa41e5cc4
author Jamie Madill <jmadill@chromium.org> Tue Jan 01 15:14:25 2019 -0500
committer Commit Bot <commit-bot@chromium.org> Wed Jan 02 06:42:25 2019 +0000
tree 87fdeda2e63b190a86a4310ed1b61bb5f89b922c
parent 76f66954db0350fc5b1696f79d3c66b47ed33537

Make default block member info a constant.

Instead of generating a struct each time we can use a constexpr
constructor to use a single representation.

Bug: angleproject:3024
Change-Id: I14dec65a4f6ac9ab2f7e7af444862e4ceab88d8c
Reviewed-on: https://chromium-review.googlesource.com/c/1392395
Reviewed-by: Jiajia Qin <jiajia.qin@intel.com>
Commit-Queue: Jamie Madill <jmadill@chromium.org>

src/libANGLE/renderer/d3d/ProgramD3D.cpp

diff --git a/src/libANGLE/renderer/d3d/ProgramD3D.cpp b/src/libANGLE/renderer/d3d/ProgramD3D.cpp
index ff1f0f7..e2f60fc 100644
--- a/src/libANGLE/renderer/d3d/ProgramD3D.cpp
+++ b/src/libANGLE/renderer/d3d/ProgramD3D.cpp
@@ -238,7 +238,7 @@
     auto infoIter = mBlockLayout.find(name);
     if (infoIter == mBlockLayout.end())
     {
-        *infoOut = sh::BlockMemberInfo::getDefaultBlockInfo();
+        *infoOut = sh::kDefaultBlockMemberInfo;
         return false;
     }
 

src/libANGLE/renderer/gl/ProgramGL.cpp

diff --git a/src/libANGLE/renderer/gl/ProgramGL.cpp b/src/libANGLE/renderer/gl/ProgramGL.cpp
index 3397c01..02b6b5f 100644
--- a/src/libANGLE/renderer/gl/ProgramGL.cpp
+++ b/src/libANGLE/renderer/gl/ProgramGL.cpp
@@ -715,7 +715,7 @@
 
     if (uniformIndex == GL_INVALID_INDEX)
     {
-        *memberInfoOut = sh::BlockMemberInfo::getDefaultBlockInfo();
+        *memberInfoOut = sh::kDefaultBlockMemberInfo;
         return false;
     }
 
@@ -744,7 +744,7 @@
 
     if (index == GL_INVALID_INDEX)
     {
-        *memberInfoOut = sh::BlockMemberInfo::getDefaultBlockInfo();
+        *memberInfoOut = sh::kDefaultBlockMemberInfo;
         return false;
     }