Fixed condition too strict in glBindSampler

glBindSampler's sampler check was too strict, as the sampler needed to exist, but not necessarily to have been allocated yet, so the condition was fixed. Change-Id: Ia8301028dbf35efa16bfc6cb74a69e105d8a505d Reviewed-on: https://swiftshader-review.googlesource.com/3965Tested-by: Alexis Hétu <sugoi@google.com> Reviewed-by: Nicolas Capens <capn@google.com>

Fixed condition too strict in glBindSampler
1b50c55d · Alexis Hetu · Alexis Hétu · 3f1d0b76 · 1b50c55d
Commit 1b50c55d authored Sep 10, 2015 by Alexis Hetu Committed by Alexis Hétu Sep 21, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 7 deletions

libGLESv3.cpp src/OpenGL/libGLESv2/libGLESv3.cpp +2 -7

No files found.
--- a/src/OpenGL/libGLESv2/libGLESv3.cpp
+++ b/src/OpenGL/libGLESv2/libGLESv3.cpp
@@ -3436,14 +3436,9 @@ GL_APICALL void GL_APIENTRY glBindSampler(GLuint unit, GLuint sampler)

 	if(context)
 	{
-		if(sampler != 0)
+		if(sampler != 0 && !context->isSampler(sampler))
 		{
-			es2::Sampler *samplerObject = context->getSampler(sampler);
-
-			if(!samplerObject)
-			{
-				return error(GL_INVALID_OPERATION);
-			}
+			return error(GL_INVALID_OPERATION);
 		}

 		context->bindSampler(unit, sampler);