diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-08-16 15:53:33 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-08-16 15:53:33 +0000 |
| commit | 2276c01920ab48b589941b4e930a087cc163a77e (patch) | |
| tree | 634132dbd15b3630fbba3f636ce535666e061961 /src | |
| parent | 66198a7d338ac941393c85dd317323292e54487a (diff) | |
Support VAO when on ES3.
R=robertphillips@google.com
Author: bsalomon@google.com
Review URL: https://chromiumcodereview.appspot.com/22909015
git-svn-id: http://skia.googlecode.com/svn/trunk@10776 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src')
| -rw-r--r-- | src/gpu/gl/GrGLCaps.cpp | 3 | ||||
| -rw-r--r-- | src/gpu/gl/GrGLInterface.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp index 10a7eefeda..61ef8524a6 100644 --- a/src/gpu/gl/GrGLCaps.cpp +++ b/src/gpu/gl/GrGLCaps.cpp @@ -213,7 +213,8 @@ void GrGLCaps::init(const GrGLContextInfo& ctxInfo, const GrGLInterface* gli) { fVertexArrayObjectSupport = version >= GR_GL_VER(3, 0) || ctxInfo.hasExtension("GL_ARB_vertex_array_object"); } else { - fVertexArrayObjectSupport = ctxInfo.hasExtension("GL_OES_vertex_array_object"); + fVertexArrayObjectSupport = version >= GR_GL_VER(3, 0) || + ctxInfo.hasExtension("GL_OES_vertex_array_object"); } if (kES_GrGLBinding == binding) { diff --git a/src/gpu/gl/GrGLInterface.cpp b/src/gpu/gl/GrGLInterface.cpp index 8f94f1002c..0aba95eaed 100644 --- a/src/gpu/gl/GrGLInterface.cpp +++ b/src/gpu/gl/GrGLInterface.cpp @@ -378,7 +378,7 @@ bool GrGLInterface::validate(GrGLBinding binding) const { } } } else { - if (extensions.has("GL_OES_vertex_array_object")) { + if (glVer >= GR_GL_VER(3,0) || extensions.has("GL_OES_vertex_array_object")) { if (NULL == fBindVertexArray || NULL == fDeleteVertexArrays || NULL == fGenVertexArrays) { |