commit 3f01f53c02e8d8ddb797174b556681262c855af4
author Qin Jiajia <jiajia.qin@intel.com> Tue Dec 11 15:13:51 2018 +0800
committer Commit Bot <commit-bot@chromium.org> Sat Dec 29 01:32:07 2018 +0000
tree e76be3d742e04f7c47072438c5bc933eeaa0b276
parent cb9609fe58c2464aa01f70404479de91dbf80f17

ES31: Add state change tests for image

This change adds dirty bit state change tests for image textures.
Meanwhile, syncImages related codes are removed since syncTextures will do
all texture states sync.

Bug: angleproject:3015

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

src/libANGLE/Context.cpp

diff --git a/src/libANGLE/Context.cpp b/src/libANGLE/Context.cpp
index b9b1b4e..d9c948c 100644
--- a/src/libANGLE/Context.cpp
+++ b/src/libANGLE/Context.cpp
@@ -284,9 +284,7 @@
 {
     kTexture0SubjectIndex       = 0,
     kTextureMaxSubjectIndex     = kTexture0SubjectIndex + IMPLEMENTATION_MAX_ACTIVE_TEXTURES,
-    kImage0SubjectIndex         = kTextureMaxSubjectIndex,
-    kImageMaxSubjectIndex       = kImage0SubjectIndex + IMPLEMENTATION_MAX_IMAGE_UNITS,
-    kUniformBuffer0SubjectIndex = kImageMaxSubjectIndex,
+    kUniformBuffer0SubjectIndex = kTextureMaxSubjectIndex,
     kUniformBufferMaxSubjectIndex =
         kUniformBuffer0SubjectIndex + IMPLEMENTATION_MAX_UNIFORM_BUFFER_BINDINGS,
     kSampler0SubjectIndex    = kUniformBufferMaxSubjectIndex,
@@ -358,12 +356,6 @@
     {
         mSamplerObserverBindings.emplace_back(this, samplerIndex);
     }
-
-    for (angle::SubjectIndex imageIndex = kImage0SubjectIndex; imageIndex < kImageMaxSubjectIndex;
-         ++imageIndex)
-    {
-        mImageObserverBindings.emplace_back(this, imageIndex);
-    }
 }
 
 void Context::initialize()
@@ -1155,7 +1147,6 @@
 {
     Texture *tex = mState.mTextures->getTexture(texture);
     mGLState.setImageUnit(this, unit, tex, level, layered, layer, access, format);
-    mImageObserverBindings[unit].bind(tex);
 }
 
 void Context::useProgram(GLuint program)
@@ -8062,10 +8053,6 @@
                 mGLState.onActiveTextureStateChange(this, index);
                 mStateCache.onActiveTextureChange(this);
             }
-            else if (index < kImageMaxSubjectIndex)
-            {
-                mGLState.onImageStateChange(this, index - kImage0SubjectIndex);
-            }
             else if (index < kUniformBufferMaxSubjectIndex)
             {
                 mGLState.onUniformBufferStateChange(index - kUniformBuffer0SubjectIndex);