| commit | 3c99be0d2f6cc82773d9eacbc421a70c07426a9b | [log] [tgz] |
|---|---|---|
| author | Alexis Hetu <sugoi@google.com> | Wed Sep 28 17:54:05 2016 -0400 |
| committer | Alexis Hétu <sugoi@google.com> | Thu Sep 29 02:57:12 2016 +0000 |
| tree | e8806d6b387ae8ef2510018e44cde29b79536b98 | |
| parent | e12780d57478a3d0e349a29169df73ae4a8ba684 [diff] |
Sampler object fix The code was not allowing to unset a sampler object from a texture, so the faulty condition was removed to fix the issue. Fixes 30 tests in: dEQP.functional.samplers.* Change-Id: Ibbc3389d3d6135db7bc5a2f87f0df5527b78c7fd Reviewed-on: https://swiftshader-review.googlesource.com/7360 Tested-by: Alexis Hétu <sugoi@google.com> Reviewed-by: Nicolas Capens <capn@google.com>
diff --git a/src/OpenGL/libGLESv2/Context.cpp b/src/OpenGL/libGLESv2/Context.cpp index 39374ce..af5c95a 100644 --- a/src/OpenGL/libGLESv2/Context.cpp +++ b/src/OpenGL/libGLESv2/Context.cpp
@@ -1284,10 +1284,7 @@ Sampler* samplerObject = getSampler(sampler); - if(sampler) - { - mState.sampler[unit] = samplerObject; - } + mState.sampler[unit] = samplerObject; return !!samplerObject; }