commit 69cce580d31bff286d9b44349919e9a1f7386ea0
author Geoff Lang <geofflang@chromium.org> Thu Sep 17 13:20:36 2015 -0400
committer Geoff Lang <geofflang@chromium.org> Thu Sep 24 18:59:57 2015 +0000
tree 82f6eb728f10450ade2fa59633644c8db75dc075
parent 006cbc5b9259b453836b97e89e7fcc4de0702cf3

Split the SamplerState struct into SamplerState and TextureState.

SamplerState is now only the members that are overridden by a sampler
object, this makes it easy to update those specific members.

Opted for getters and setters for each member in Texture and Sampler
because it will be required to enable dirty bits for these states.

Added maxAnisotropy to the SamplerState instead of texture state.  The
sampler objects extension mentions it should be there.

BUG=angleproject:1162

Change-Id: I5aa6d702bd5915ee9df1976afef3c8c1f69d27c8
Reviewed-on: https://chromium-review.googlesource.com/300490
Tryjob-Request: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>

src/libANGLE/validationES2.cpp

diff --git a/src/libANGLE/validationES2.cpp b/src/libANGLE/validationES2.cpp
index 377c350..429f430 100644
--- a/src/libANGLE/validationES2.cpp
+++ b/src/libANGLE/validationES2.cpp
@@ -110,7 +110,7 @@
     }
     else
     {
-        if (texture->isImmutable())
+        if (texture->getImmutableFormat())
         {
             context->recordError(Error(GL_INVALID_OPERATION));
             return false;
@@ -824,7 +824,7 @@
         return false;
     }
 
-    if (texture->isImmutable())
+    if (texture->getImmutableFormat())
     {
         context->recordError(Error(GL_INVALID_OPERATION));
         return false;