summaryrefslogtreecommitdiff
path: root/gpu/gl/angle/GrGLCreateANGLEInterface.cpp
diff options
context:
space:
mode:
authorTorne (Richard Coles) <torne@google.com>2014-05-14 12:13:15 +0100
committerTorne (Richard Coles) <torne@google.com>2014-05-14 12:13:15 +0100
commit6b0bad3aba066dc8d7d47a5f6738ebf773ffc2e9 (patch)
treead988be7ad87928b7b98c44f2def4cce7d3330b6 /gpu/gl/angle/GrGLCreateANGLEInterface.cpp
parent27ab20dffff01006f5d20fdb2b3f4ea503d69114 (diff)
parentd60f7edf0fa7eb2eb7c99de486abfe61ad3dcd69 (diff)
downloadsrc-main.tar.gz
Merge from Chromium at DEPS revision 269336HEADmastermain
This commit was generated by merge_to_master.py. Change-Id: I9d3335dcb08fc53d18bec993b89047b409bd7eb1
Diffstat (limited to 'gpu/gl/angle/GrGLCreateANGLEInterface.cpp')
-rw-r--r--gpu/gl/angle/GrGLCreateANGLEInterface.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/gpu/gl/angle/GrGLCreateANGLEInterface.cpp b/gpu/gl/angle/GrGLCreateANGLEInterface.cpp
index a316ff1c..cb2fc953 100644
--- a/gpu/gl/angle/GrGLCreateANGLEInterface.cpp
+++ b/gpu/gl/angle/GrGLCreateANGLEInterface.cpp
@@ -154,6 +154,14 @@ const GrGLInterface* GrGLCreateANGLEInterface() {
functions->fMapBuffer = (GrGLMapBufferProc) eglGetProcAddress("glMapBufferOES");
functions->fUnmapBuffer = (GrGLUnmapBufferProc) eglGetProcAddress("glUnmapBufferOES");
+#if GL_ES_VERSION_3_0
+ functions->fMapBufferRange = GET_PROC(glMapBufferRange);
+ functions->fFlushMappedBufferRange = GET_PROC(glFlushMappedBufferRange);
+#else
+ functions->fMapBufferRange = (GrGLMapBufferRangeProc) eglGetProcAddress("glMapBufferRange");
+ functions->fFlushMappedBufferRange = (GrGLFlushMappedBufferRangeProc) eglGetProcAddress("glFlushMappedBufferRange");
+#endif
+
functions->fInsertEventMarker = (GrGLInsertEventMarkerProc) eglGetProcAddress("glInsertEventMarkerEXT");
functions->fPushGroupMarker = (GrGLInsertEventMarkerProc) eglGetProcAddress("glPushGroupMarkerEXT");
functions->fPopGroupMarker = (GrGLPopGroupMarkerProc) eglGetProcAddress("glPopGroupMarkerEXT");