commit 34bc315d5cbbd9a9b9e5dbb1507c4d42ebb16186
author JiangYizhou <yizhou.jiang@intel.com> Wed Mar 29 14:56:01 2017 +0800
committer Commit Bot <commit-bot@chromium.org> Thu Jul 13 16:34:00 2017 +0000
tree 0f36e793e44a035ba0cde1822c66fa3b6f83a92e
parent 3ec75686fd9340bf1e0073e37466e1e082aa7e85

ES31: Implement multisampled Textures for D3D part.

Implement TexStorage2DMultisample api for d3d part.

BUG=angleproject:1590
TEST=angle_end2end_tests --gtest_filter=TextureMultisampleTest*
TEST=angle_deqp_gles31_tests --deqp-case=dEQP-GLES31.functional.texture.multisample.negative.fbo_*

Change-Id: Icbfba45b9c2965af02b54dd4060b7b49970cb74b
Reviewed-on: https://chromium-review.googlesource.com/457161
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>

src/compiler/translator/TextureFunctionHLSL.cpp

diff --git a/src/compiler/translator/TextureFunctionHLSL.cpp b/src/compiler/translator/TextureFunctionHLSL.cpp
index 51d4540..bbf69b1 100644
--- a/src/compiler/translator/TextureFunctionHLSL.cpp
+++ b/src/compiler/translator/TextureFunctionHLSL.cpp
@@ -231,6 +231,8 @@
         {
             case EbtSampler2D:
                 return 2;
+            case EbtSampler2DMS:
+                return 2;
             case EbtSampler3D:
                 return 3;
             case EbtSamplerCube:
@@ -241,6 +243,8 @@
                 return 2;
             case EbtISampler2D:
                 return 2;
+            case EbtISampler2DMS:
+                return 2;
             case EbtISampler3D:
                 return 3;
             case EbtISamplerCube:
@@ -249,6 +253,8 @@
                 return 3;
             case EbtUSampler2D:
                 return 2;
+            case EbtUSampler2DMS:
+                return 2;
             case EbtUSampler3D:
                 return 3;
             case EbtUSamplerCube:
@@ -1086,17 +1092,20 @@
         switch (sampler)
         {
             case EbtSampler2D:
+            case EbtSampler2DMS:
             case EbtSampler3D:
             case EbtSamplerCube:
             case EbtSampler2DArray:
             case EbtSamplerExternalOES:
                 return "float4";
             case EbtISampler2D:
+            case EbtISampler2DMS:
             case EbtISampler3D:
             case EbtISamplerCube:
             case EbtISampler2DArray:
                 return "int4";
             case EbtUSampler2D:
+            case EbtUSampler2DMS:
             case EbtUSampler3D:
             case EbtUSamplerCube:
             case EbtUSampler2DArray: