diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-05-05 14:26:28 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-05-05 14:26:28 +0000 |
| commit | d4117eda3c0b06341359a2e6b1b681db3c0eb35c (patch) | |
| tree | 00d659082e058d358585570b586f70481183ce60 | |
| parent | 31114ce34327413a289f96f9e9572e0413f3c225 (diff) | |
| parent | 2daacdf0cc5790a8ed017bfdfcf802105682a846 (diff) | |
| download | include-d4117eda3c0b06341359a2e6b1b681db3c0eb35c.tar.gz | |
Merge third_party/skia/include from https://chromium.googlesource.com/external/skia/include.git at 2daacdf0cc5790a8ed017bfdfcf802105682a846
This commit was generated by merge_from_chromium.py.
Change-Id: I09348bfa2464ec11d24696af0f4e8800d52dbb5a
| -rw-r--r-- | gpu/gl/GrGLFunctions.h | 2 | ||||
| -rw-r--r-- | gpu/gl/GrGLInterface.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/gpu/gl/GrGLFunctions.h b/gpu/gl/GrGLFunctions.h index 3f87365..51db053 100644 --- a/gpu/gl/GrGLFunctions.h +++ b/gpu/gl/GrGLFunctions.h @@ -111,6 +111,7 @@ extern "C" { typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLEndQueryProc)(GrGLenum target); typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLFinishProc)(); typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLFlushProc)(); + typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLFlushMappedBufferRangeProc)(GrGLenum target, GrGLintptr offset, GrGLsizeiptr length); typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLFramebufferRenderbufferProc)(GrGLenum target, GrGLenum attachment, GrGLenum renderbuffertarget, GrGLuint renderbuffer); typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLFramebufferTexture2DProc)(GrGLenum target, GrGLenum attachment, GrGLenum textarget, GrGLuint texture, GrGLint level); typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLFramebufferTexture2DMultisampleProc)(GrGLenum target, GrGLenum attachment, GrGLenum textarget, GrGLuint texture, GrGLint level, GrGLsizei samples); @@ -150,6 +151,7 @@ extern "C" { typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLLineWidthProc)(GrGLfloat width); typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLLinkProgramProc)(GrGLuint program); typedef GrGLvoid* (GR_GL_FUNCTION_TYPE* GrGLMapBufferProc)(GrGLenum target, GrGLenum access); + typedef GrGLvoid* (GR_GL_FUNCTION_TYPE* GrGLMapBufferRangeProc)(GrGLenum target, GrGLintptr offset, GrGLsizeiptr length, GrGLbitfield access); typedef GrGLvoid* (GR_GL_FUNCTION_TYPE* GrGLMapBufferSubDataProc)(GrGLuint target, GrGLintptr offset, GrGLsizeiptr size, GrGLenum access); typedef GrGLvoid* (GR_GL_FUNCTION_TYPE* GrGLMapTexSubImage2DProc)(GrGLenum target, GrGLint level, GrGLint xoffset, GrGLint yoffset, GrGLsizei width, GrGLsizei height, GrGLenum format, GrGLenum type, GrGLenum access); typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLPixelStoreiProc)(GrGLenum pname, GrGLint param); diff --git a/gpu/gl/GrGLInterface.h b/gpu/gl/GrGLInterface.h index 9070af2..2b33e8e 100644 --- a/gpu/gl/GrGLInterface.h +++ b/gpu/gl/GrGLInterface.h @@ -192,6 +192,7 @@ public: GLPtr<GrGLEndQueryProc> fEndQuery; GLPtr<GrGLFinishProc> fFinish; GLPtr<GrGLFlushProc> fFlush; + GLPtr<GrGLFlushMappedBufferRangeProc> fFlushMappedBufferRange; GLPtr<GrGLFramebufferRenderbufferProc> fFramebufferRenderbuffer; GLPtr<GrGLFramebufferTexture2DProc> fFramebufferTexture2D; GLPtr<GrGLFramebufferTexture2DMultisampleProc> fFramebufferTexture2DMultisample; @@ -231,6 +232,7 @@ public: GLPtr<GrGLLineWidthProc> fLineWidth; GLPtr<GrGLLinkProgramProc> fLinkProgram; GLPtr<GrGLMapBufferProc> fMapBuffer; + GLPtr<GrGLMapBufferRangeProc> fMapBufferRange; GLPtr<GrGLMapBufferSubDataProc> fMapBufferSubData; GLPtr<GrGLMapTexSubImage2DProc> fMapTexSubImage2D; GLPtr<GrGLMatrixLoadfProc> fMatrixLoadf; |