commit 1bf18ce9e2caca7067b4439373f4fb04a5cd7d21
author Austin Eng <enga@chromium.org> Fri Oct 19 15:34:02 2018 -0700
committer Commit Bot <commit-bot@chromium.org> Tue Nov 06 18:04:07 2018 +0000
tree 0fad52812e82d9b6a48c5699caeaa513594395ac
parent bc5834cdadbd5c278c57024c15bbf70d9a224262

Implement GL_ANGLE_multi_draw

This patch adds entrypoints glMultiDrawArraysANGLE,
glMultiDrawElementsANGLE, glMultiDrawArraysInstancedANGLE,
annd glMultiDrawElementsInstancedANGLE

Bug: chromium:890539

Change-Id: Ic9c374c53892460f44ca6e73a253b78473ac2dff
Reviewed-on: https://chromium-review.googlesource.com/c/1282268
Reviewed-by: Kai Ninomiya <kainino@chromium.org>
Commit-Queue: Austin Eng <enga@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 c60eca3..15b0cf0 100644
--- a/src/libANGLE/renderer/d3d/ProgramD3D.cpp
+++ b/src/libANGLE/renderer/d3d/ProgramD3D.cpp
@@ -2170,7 +2170,7 @@
         mImageBindingMap[uniform.name] = uniform.binding;
         return;
     }
-    else if (uniform.isBuiltIn())
+    else if (uniform.isBuiltIn() && !uniform.isEmulatedBuiltIn())
     {
         defineUniform(shader->getType(), uniform, uniform.name, HLSLRegisterType::None, nullptr,
                       uniformMap);