commit 78f4180564b36fbb3ab21f298b12e2a1c8b18fcf
author Jamie Madill <jmadill@chromium.org> Mon Aug 25 15:47:55 2014 -0400
committer Jamie Madill <jmadill@chromium.org> Wed Aug 27 20:47:06 2014 +0000
tree 3b3662cff7ec0af27fb68f14984d1cb0ac927815
parent 99a1e985196cab0ab309209fe8319f6bdbe1dd20

Refactor GetUniform validator helpers.

BUG=angle:571

Change-Id: I7b36c7af38b102a24dc0e5d5d87fc042533e90af
Reviewed-on: https://chromium-review.googlesource.com/212933
Tested-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>

src/libGLESv2/validationES3.cpp

diff --git a/src/libGLESv2/validationES3.cpp b/src/libGLESv2/validationES3.cpp
index c534b3a..956dd20 100644
--- a/src/libGLESv2/validationES3.cpp
+++ b/src/libGLESv2/validationES3.cpp
@@ -1215,25 +1215,7 @@
         return gl::error(GL_INVALID_OPERATION, false);
     }
 
-    if (program == 0)
-    {
-        return gl::error(GL_INVALID_VALUE, false);
-    }
-
-    gl::Program *programObject = context->getProgram(program);
-
-    if (!programObject || !programObject->isLinked())
-    {
-        return gl::error(GL_INVALID_OPERATION, false);
-    }
-
-    gl::ProgramBinary *programBinary = programObject->getProgramBinary();
-    if (!programBinary)
-    {
-        return gl::error(GL_INVALID_OPERATION, false);
-    }
-
-    return true;
+    return ValidateGetUniformBase(context, program, location);
 }
 
 }