From 87c6d7a99ee7fee2dcc537a1ccad95fc5a9bd26b Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Fri, 1 Mar 2013 14:37:18 +0000 Subject: Add support to GrGLInterface for vertex array objects Review URL: https://codereview.chromium.org/12379025 git-svn-id: http://skia.googlecode.com/svn/trunk@7919 2bbb7eff-a529-9590-31e7-b0007b416f81 --- include/gpu/gl/GrGLFunctions.h | 5 ++++- include/gpu/gl/GrGLInterface.h | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'include/gpu/gl') diff --git a/include/gpu/gl/GrGLFunctions.h b/include/gpu/gl/GrGLFunctions.h index 3ef30aa7e1..c20842241d 100644 --- a/include/gpu/gl/GrGLFunctions.h +++ b/include/gpu/gl/GrGLFunctions.h @@ -26,7 +26,7 @@ typedef short GrGLshort; typedef int GrGLint; typedef int GrGLsizei; typedef int64_t GrGLint64; -typedef unsigned char GrGLubyte; +typedef unsigned char GrGLubyte; typedef unsigned short GrGLushort; typedef unsigned int GrGLuint; typedef uint64_t GrGLuint64; @@ -52,6 +52,7 @@ extern "C" { typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLBlendColorProc)(GrGLclampf red, GrGLclampf green, GrGLclampf blue, GrGLclampf alpha); typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLBindFragDataLocationProc)(GrGLuint program, GrGLuint colorNumber, const GrGLchar* name); typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLBindFragDataLocationIndexedProc)(GrGLuint program, GrGLuint colorNumber, GrGLuint index, const GrGLchar * name); + typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLBindVertexArrayProc)(GrGLuint array); typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLBlendFuncProc)(GrGLenum sfactor, GrGLenum dfactor); typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLBlitFramebufferProc)(GrGLint srcX0, GrGLint srcY0, GrGLint srcX1, GrGLint srcY1, GrGLint dstX0, GrGLint dstY0, GrGLint dstX1, GrGLint dstY1, GrGLbitfield mask, GrGLenum filter); typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLBufferDataProc)(GrGLenum target, GrGLsizeiptr size, const GrGLvoid* data, GrGLenum usage); @@ -73,6 +74,7 @@ extern "C" { typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLDeleteRenderbuffersProc)(GrGLsizei n, const GrGLuint *renderbuffers); typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLDeleteShaderProc)(GrGLuint shader); typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLDeleteTexturesProc)(GrGLsizei n, const GrGLuint* textures); + typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLDeleteVertexArraysProc)(GrGLsizei n, const GrGLuint *arrays); typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLDepthMaskProc)(GrGLboolean flag); typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLDisableProc)(GrGLenum cap); typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLDisableVertexAttribArrayProc)(GrGLuint index); @@ -93,6 +95,7 @@ extern "C" { typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGenQueriesProc)(GrGLsizei n, GrGLuint *ids); typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGenRenderbuffersProc)(GrGLsizei n, GrGLuint *renderbuffers); typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGenTexturesProc)(GrGLsizei n, GrGLuint* textures); + typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGenVertexArraysProc)(GrGLsizei n, GrGLuint *arrays); typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGetBufferParameterivProc)(GrGLenum target, GrGLenum pname, GrGLint* params); typedef GrGLenum (GR_GL_FUNCTION_TYPE* GrGLGetErrorProc)(); typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGetFramebufferAttachmentParameterivProc)(GrGLenum target, GrGLenum attachment, GrGLenum pname, GrGLint* params); diff --git a/include/gpu/gl/GrGLInterface.h b/include/gpu/gl/GrGLInterface.h index 821ea7a77b..bb6a34aba2 100644 --- a/include/gpu/gl/GrGLInterface.h +++ b/include/gpu/gl/GrGLInterface.h @@ -146,6 +146,7 @@ public: GLPtr fBindFramebuffer; GLPtr fBindRenderbuffer; GLPtr fBindTexture; + GLPtr fBindVertexArray; GLPtr fBlendColor; GLPtr fBlendFunc; GLPtr fBlitFramebuffer; @@ -168,6 +169,7 @@ public: GLPtr fDeleteRenderbuffers; GLPtr fDeleteShader; GLPtr fDeleteTextures; + GLPtr fDeleteVertexArrays; GLPtr fDepthMask; GLPtr fDisable; GLPtr fDisableVertexAttribArray; @@ -188,6 +190,7 @@ public: GLPtr fGenQueries; GLPtr fGenRenderbuffers; GLPtr fGenTextures; + GLPtr fGenVertexArrays; GLPtr fGetBufferParameteriv; GLPtr fGetError; GLPtr fGetFramebufferAttachmentParameteriv; -- cgit v1.2.3