aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/gpu/gl/GrGLInterface.h
diff options
context:
space:
mode:
authorGravatar csmartdalton <csmartdalton@google.com>2016-06-03 08:28:47 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-06-03 08:28:47 -0700
commit5cebf8c82dfe3fc4110944f0db03d7fc85b7142a (patch)
tree253862887f3b3c5256d2d891fdd5933f3792410e /include/gpu/gl/GrGLInterface.h
parent2cee902847a940c4bab56b42dabbb3721be3f9ac (diff)
Support ARB extensions for indirect drawing
Adds support for the ARB extensions and fixes incorrect logic that was being used on the GL version for indirect drawing. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2038743002 Review-Url: https://codereview.chromium.org/2038743002
Diffstat (limited to 'include/gpu/gl/GrGLInterface.h')
-rw-r--r--include/gpu/gl/GrGLInterface.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/include/gpu/gl/GrGLInterface.h b/include/gpu/gl/GrGLInterface.h
index 47dfbaab20..b735b8fadf 100644
--- a/include/gpu/gl/GrGLInterface.h
+++ b/include/gpu/gl/GrGLInterface.h
@@ -206,6 +206,8 @@ public:
GrGLFunction<GrGLMapBufferRangeProc> fMapBufferRange;
GrGLFunction<GrGLMapBufferSubDataProc> fMapBufferSubData;
GrGLFunction<GrGLMapTexSubImage2DProc> fMapTexSubImage2D;
+ GrGLFunction<GrGLMultiDrawArraysIndirectProc> fMultiDrawArraysIndirect;
+ GrGLFunction<GrGLMultiDrawElementsIndirectProc> fMultiDrawElementsIndirect;
GrGLFunction<GrGLPixelStoreiProc> fPixelStorei;
GrGLFunction<GrGLPopGroupMarkerProc> fPopGroupMarker;
GrGLFunction<GrGLPushGroupMarkerProc> fPushGroupMarker;
@@ -323,10 +325,6 @@ public:
/* NV_framebuffer_mixed_samples */
GrGLFunction<GrGLCoverageModulationProc> fCoverageModulation;
- /* EXT_multi_draw_indirect */
- GrGLFunction<GrGLMultiDrawArraysIndirectProc> fMultiDrawArraysIndirect;
- GrGLFunction<GrGLMultiDrawElementsIndirectProc> fMultiDrawElementsIndirect;
-
/* NV_bindless_texture */
// We use the NVIDIA verson for now because it does not require dynamically uniform handles.
// We may switch the the ARB version and/or omit methods in the future.