AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove GL functions only used in fixed pipe

Browse Source 
Review URL: http://codereview.appspot.com/5374084/



git-svn-id: http://skia.googlecode.com/svn/trunk@2681 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
bsalomon@google.com 2011-11-14 20:17:05 +00:00
parent 4c5de58552
commit f64b1a27f7
8 changed files with 0 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
include/gpu/GrGLInterface.h
View File

@ -129,8 +129,6 @@ extern "C" {
typedef GrGLvoid (GR_GL_FUNCTION_TYPE *GrGLClearProc)(GrGLbitfield mask);
typedef GrGLvoid (GR_GL_FUNCTION_TYPE *GrGLClearColorProc)(GrGLclampf red, GrGLclampf green, GrGLclampf blue, GrGLclampf alpha);
typedef GrGLvoid (GR_GL_FUNCTION_TYPE *GrGLClearStencilProc)(GrGLint s);
typedef GrGLvoid (GR_GL_FUNCTION_TYPE *GrGLClientActiveTextureProc)(GrGLenum texture);
typedef GrGLvoid (GR_GL_FUNCTION_TYPE *GrGLColor4ubProc)(GrGLubyte red, GrGLubyte green, GrGLubyte blue, GrGLubyte alpha);
typedef GrGLvoid (GR_GL_FUNCTION_TYPE *GrGLColorMaskProc)(GrGLboolean red, GrGLboolean green, GrGLboolean blue, GrGLboolean alpha);
typedef GrGLvoid (GR_GL_FUNCTION_TYPE *GrGLColorPointerProc)(GrGLint size, GrGLenum type, GrGLsizei stride, const GrGLvoid* pointer);
typedef GrGLvoid (GR_GL_FUNCTION_TYPE *GrGLCompileShaderProc)(GrGLuint shader);
@ -145,14 +143,12 @@ extern "C" {
typedef GrGLvoid (GR_GL_FUNCTION_TYPE *GrGLDeleteTexturesProc)(GrGLsizei n, const GrGLuint* textures);
typedef GrGLvoid (GR_GL_FUNCTION_TYPE *GrGLDepthMaskProc)(GrGLboolean flag);
typedef GrGLvoid (GR_GL_FUNCTION_TYPE *GrGLDisableProc)(GrGLenum cap);
typedef GrGLvoid (GR_GL_FUNCTION_TYPE *GrGLDisableClientStateProc)(GrGLenum array);
typedef GrGLvoid (GR_GL_FUNCTION_TYPE *GrGLDisableVertexAttribArrayProc)(GrGLuint index);
typedef GrGLvoid (GR_GL_FUNCTION_TYPE *GrGLDrawArraysProc)(GrGLenum mode, GrGLint first, GrGLsizei count);
typedef GrGLvoid (GR_GL_FUNCTION_TYPE *GrGLDrawBufferProc)(GrGLenum mode);
typedef GrGLvoid (GR_GL_FUNCTION_TYPE *GrGLDrawBuffersProc)(GrGLsizei n, const GrGLenum* bufs);
typedef GrGLvoid (GR_GL_FUNCTION_TYPE *GrGLDrawElementsProc)(GrGLenum mode, GrGLsizei count, GrGLenum type, const GrGLvoid* indices);
typedef GrGLvoid (GR_GL_FUNCTION_TYPE *GrGLEnableProc)(GrGLenum cap);
typedef GrGLvoid (GR_GL_FUNCTION_TYPE *GrGLEnableClientStateProc)(GrGLenum cap);
typedef GrGLvoid (GR_GL_FUNCTION_TYPE *GrGLEnableVertexAttribArrayProc)(GrGLuint index);
typedef GrGLvoid (GR_GL_FUNCTION_TYPE *GrGLEndQueryProc)(GrGLenum target);
typedef GrGLvoid (GR_GL_FUNCTION_TYPE *GrGLFinishProc)();
@ -178,15 +174,11 @@ extern "C" {
typedef GrGLint (GR_GL_FUNCTION_TYPE *GrGLGetUniformLocationProc)(GrGLuint program, const char* name);
typedef GrGLvoid (GR_GL_FUNCTION_TYPE *GrGLLineWidthProc)(GrGLfloat width);
typedef GrGLvoid (GR_GL_FUNCTION_TYPE *GrGLLinkProgramProc)(GrGLuint program);
typedef GrGLvoid (GR_GL_FUNCTION_TYPE *GrGLLoadMatrixfProc)(const GrGLfloat* m);
typedef GrGLvoid (GR_GL_FUNCTION_TYPE *GrGLMatrixModeProc)(GrGLenum mode);
typedef GrGLvoid (GR_GL_FUNCTION_TYPE *GrGLPixelStoreiProc)(GrGLenum pname, GrGLint param);
typedef GrGLvoid (GR_GL_FUNCTION_TYPE *GrGLPointSizeProc)(GrGLfloat size);
typedef GrGLvoid (GR_GL_FUNCTION_TYPE *GrGLQueryCounterProc)(GrGLuint id, GrGLenum target);
typedef GrGLvoid (GR_GL_FUNCTION_TYPE *GrGLReadBufferProc)(GrGLenum src);
typedef GrGLvoid (GR_GL_FUNCTION_TYPE *GrGLReadPixelsProc)(GrGLint x, GrGLint y, GrGLsizei width, GrGLsizei height, GrGLenum format, GrGLenum type, GrGLvoid* pixels);
typedef GrGLvoid (GR_GL_FUNCTION_TYPE *GrGLScissorProc)(GrGLint x, GrGLint y, GrGLsizei width, GrGLsizei height);
typedef GrGLvoid (GR_GL_FUNCTION_TYPE *GrGLShadeModelProc)(GrGLenum mode);
typedef GrGLvoid (GR_GL_FUNCTION_TYPE *GrGLShaderSourceProc)(GrGLuint shader, GrGLsizei count, const char** str, const GrGLint* length);
typedef GrGLvoid (GR_GL_FUNCTION_TYPE *GrGLStencilFuncProc)(GrGLenum func, GrGLint ref, GrGLuint mask);
typedef GrGLvoid (GR_GL_FUNCTION_TYPE *GrGLStencilFuncSeparateProc)(GrGLenum face, GrGLenum func, GrGLint ref, GrGLuint mask);
@ -194,8 +186,6 @@ extern "C" {
typedef GrGLvoid (GR_GL_FUNCTION_TYPE *GrGLStencilMaskSeparateProc)(GrGLenum face, GrGLuint mask);
typedef GrGLvoid (GR_GL_FUNCTION_TYPE *GrGLStencilOpProc)(GrGLenum fail, GrGLenum zfail, GrGLenum zpass);
typedef GrGLvoid (GR_GL_FUNCTION_TYPE *GrGLStencilOpSeparateProc)(GrGLenum face, GrGLenum fail, GrGLenum zfail, GrGLenum zpass);
typedef GrGLvoid (GR_GL_FUNCTION_TYPE *GrGLTexCoordPointerProc)(GrGLint size, GrGLenum type, GrGLsizei stride, const GrGLvoid* pointer);
typedef GrGLvoid (GR_GL_FUNCTION_TYPE *GrGLTexEnviProc)(GrGLenum target, GrGLenum pname, GrGLint param);
typedef GrGLvoid (GR_GL_FUNCTION_TYPE *GrGLTexImage2DProc)(GrGLenum target, GrGLint level, GrGLint internalformat, GrGLsizei width, GrGLsizei height, GrGLint border, GrGLenum format, GrGLenum type, const GrGLvoid* pixels);
typedef GrGLvoid (GR_GL_FUNCTION_TYPE *GrGLTexParameteriProc)(GrGLenum target, GrGLenum pname, GrGLint param);
typedef GrGLvoid (GR_GL_FUNCTION_TYPE *GrGLTexSubImage2DProc)(GrGLenum target, GrGLint level, GrGLint xoffset, GrGLint yoffset, GrGLsizei width, GrGLsizei height, GrGLenum format, GrGLenum type, const GrGLvoid* pixels);
@ -221,7 +211,6 @@ extern "C" {
typedef GrGLvoid (GR_GL_FUNCTION_TYPE *GrGLUseProgramProc)(GrGLuint program);
typedef GrGLvoid (GR_GL_FUNCTION_TYPE *GrGLVertexAttrib4fvProc)(GrGLuint indx, const GrGLfloat* values);
typedef GrGLvoid (GR_GL_FUNCTION_TYPE *GrGLVertexAttribPointerProc)(GrGLuint indx, GrGLint size, GrGLenum type, GrGLboolean normalized, GrGLsizei stride, const GrGLvoid* ptr);
typedef GrGLvoid (GR_GL_FUNCTION_TYPE *GrGLVertexPointerProc)(GrGLint size, GrGLenum type, GrGLsizei stride, const GrGLvoid* pointer);
typedef GrGLvoid (GR_GL_FUNCTION_TYPE *GrGLViewportProc)(GrGLint x, GrGLint y, GrGLsizei width, GrGLsizei height);
// FBO Extension Functions
@ -313,8 +302,6 @@ struct GR_API GrGLInterface : public GrRefCnt {
GrGLClearProc fClear;
GrGLClearColorProc fClearColor;
GrGLClearStencilProc fClearStencil;
GrGLClientActiveTextureProc fClientActiveTexture;
GrGLColor4ubProc fColor4ub;
GrGLColorMaskProc fColorMask;
GrGLColorPointerProc fColorPointer;
GrGLCompileShaderProc fCompileShader;
@ -329,14 +316,12 @@ struct GR_API GrGLInterface : public GrRefCnt {
GrGLDeleteTexturesProc fDeleteTextures;
GrGLDepthMaskProc fDepthMask;
GrGLDisableProc fDisable;
GrGLDisableClientStateProc fDisableClientState;
GrGLDisableVertexAttribArrayProc fDisableVertexAttribArray;
GrGLDrawArraysProc fDrawArrays;
GrGLDrawBufferProc fDrawBuffer;
GrGLDrawBuffersProc fDrawBuffers;
GrGLDrawElementsProc fDrawElements;
GrGLEnableProc fEnable;
GrGLEnableClientStateProc fEnableClientState;
GrGLEnableVertexAttribArrayProc fEnableVertexAttribArray;
GrGLEndQueryProc fEndQuery;
GrGLFinishProc fFinish;
@ -362,15 +347,11 @@ struct GR_API GrGLInterface : public GrRefCnt {
GrGLGetUniformLocationProc fGetUniformLocation;
GrGLLineWidthProc fLineWidth;
GrGLLinkProgramProc fLinkProgram;
GrGLLoadMatrixfProc fLoadMatrixf;
GrGLMatrixModeProc fMatrixMode;
GrGLPixelStoreiProc fPixelStorei;
GrGLPointSizeProc fPointSize;
GrGLQueryCounterProc fQueryCounter;
GrGLReadBufferProc fReadBuffer;
GrGLReadPixelsProc fReadPixels;
GrGLScissorProc fScissor;
GrGLShadeModelProc fShadeModel;
GrGLShaderSourceProc fShaderSource;
GrGLStencilFuncProc fStencilFunc;
GrGLStencilFuncSeparateProc fStencilFuncSeparate;
@ -378,8 +359,6 @@ struct GR_API GrGLInterface : public GrRefCnt {
GrGLStencilMaskSeparateProc fStencilMaskSeparate;
GrGLStencilOpProc fStencilOp;
GrGLStencilOpSeparateProc fStencilOpSeparate;
GrGLTexCoordPointerProc fTexCoordPointer;
GrGLTexEnviProc fTexEnvi;
GrGLTexImage2DProc fTexImage2D;
GrGLTexParameteriProc fTexParameteri;
GrGLTexSubImage2DProc fTexSubImage2D;
@ -405,7 +384,6 @@ struct GR_API GrGLInterface : public GrRefCnt {
GrGLUseProgramProc fUseProgram;
GrGLVertexAttrib4fvProc fVertexAttrib4fv;
GrGLVertexAttribPointerProc fVertexAttribPointer;
GrGLVertexPointerProc fVertexPointer;
GrGLViewportProc fViewport;
// FBO Extension Functions

24
src/gpu/GrGLCreateNullInterface.cpp
View File

@ -22,23 +22,18 @@ GrGLvoid GR_GL_FUNCTION_TYPE nullGLBufferSubData(GrGLenum target, GrGLintptr off
GrGLvoid GR_GL_FUNCTION_TYPE nullGLClear(GrGLbitfield mask) {}
GrGLvoid GR_GL_FUNCTION_TYPE nullGLClearColor(GrGLclampf red, GrGLclampf green, GrGLclampf blue, GrGLclampf alpha) {}
GrGLvoid GR_GL_FUNCTION_TYPE nullGLClearStencil(GrGLint s) {}
GrGLvoid GR_GL_FUNCTION_TYPE nullGLClientActiveTexture(GrGLenum texture) {}
GrGLvoid GR_GL_FUNCTION_TYPE nullGLColor4ub(GrGLubyte red, GrGLubyte green, GrGLubyte blue, GrGLubyte alpha) {}
GrGLvoid GR_GL_FUNCTION_TYPE nullGLColorMask(GrGLboolean red, GrGLboolean green, GrGLboolean blue, GrGLboolean alpha) {}
GrGLvoid GR_GL_FUNCTION_TYPE nullGLColorPointer(GrGLint size, GrGLenum type, GrGLsizei stride, const GrGLvoid* pointer) {}
GrGLvoid GR_GL_FUNCTION_TYPE nullGLCompileShader(GrGLuint shader) {}
GrGLvoid GR_GL_FUNCTION_TYPE nullGLCompressedTexImage2D(GrGLenum target, GrGLint level, GrGLenum internalformat, GrGLsizei width, GrGLsizei height, GrGLint border, GrGLsizei imageSize, const GrGLvoid* data) {}
GrGLvoid GR_GL_FUNCTION_TYPE nullGLCullFace(GrGLenum mode) {}
GrGLvoid GR_GL_FUNCTION_TYPE nullGLDepthMask(GrGLboolean flag) {}
GrGLvoid GR_GL_FUNCTION_TYPE nullGLDisable(GrGLenum cap) {}
GrGLvoid GR_GL_FUNCTION_TYPE nullGLDisableClientState(GrGLenum array) {}
GrGLvoid GR_GL_FUNCTION_TYPE nullGLDisableVertexAttribArray(GrGLuint index) {}
GrGLvoid GR_GL_FUNCTION_TYPE nullGLDrawArrays(GrGLenum mode, GrGLint first, GrGLsizei count) {}
GrGLvoid GR_GL_FUNCTION_TYPE nullGLDrawBuffer(GrGLenum mode) {}
GrGLvoid GR_GL_FUNCTION_TYPE nullGLDrawBuffers(GrGLsizei n, const GrGLenum* bufs) {}
GrGLvoid GR_GL_FUNCTION_TYPE nullGLDrawElements(GrGLenum mode, GrGLsizei count, GrGLenum type, const GrGLvoid* indices) {}
GrGLvoid GR_GL_FUNCTION_TYPE nullGLEnable(GrGLenum cap) {}
GrGLvoid GR_GL_FUNCTION_TYPE nullGLEnableClientState(GrGLenum cap) {}
GrGLvoid GR_GL_FUNCTION_TYPE nullGLEnableVertexAttribArray(GrGLuint index) {}
GrGLvoid GR_GL_FUNCTION_TYPE nullGLEndQuery(GrGLenum target) {}
GrGLvoid GR_GL_FUNCTION_TYPE nullGLFinish() {}
@ -46,15 +41,11 @@ GrGLvoid GR_GL_FUNCTION_TYPE nullGLFlush() {}
GrGLvoid GR_GL_FUNCTION_TYPE nullGLFrontFace(GrGLenum mode) {}
GrGLvoid GR_GL_FUNCTION_TYPE nullGLLineWidth(GrGLfloat width) {}
GrGLvoid GR_GL_FUNCTION_TYPE nullGLLinkProgram(GrGLuint program) {}
GrGLvoid GR_GL_FUNCTION_TYPE nullGLLoadMatrixf(const GrGLfloat* m) {}
GrGLvoid GR_GL_FUNCTION_TYPE nullGLMatrixMode(GrGLenum mode) {}
GrGLvoid GR_GL_FUNCTION_TYPE nullGLPixelStorei(GrGLenum pname, GrGLint param) {}
GrGLvoid GR_GL_FUNCTION_TYPE nullGLPointSize(GrGLfloat size) {}
GrGLvoid GR_GL_FUNCTION_TYPE nullGLQueryCounter(GrGLuint id, GrGLenum target) {}
GrGLvoid GR_GL_FUNCTION_TYPE nullGLReadBuffer(GrGLenum src) {}
GrGLvoid GR_GL_FUNCTION_TYPE nullGLReadPixels(GrGLint x, GrGLint y, GrGLsizei width, GrGLsizei height, GrGLenum format, GrGLenum type, GrGLvoid* pixels) {}
GrGLvoid GR_GL_FUNCTION_TYPE nullGLScissor(GrGLint x, GrGLint y, GrGLsizei width, GrGLsizei height) {}
GrGLvoid GR_GL_FUNCTION_TYPE nullGLShadeModel(GrGLenum mode) {}
GrGLvoid GR_GL_FUNCTION_TYPE nullGLShaderSource(GrGLuint shader, GrGLsizei count, const char** str, const GrGLint* length) {}
GrGLvoid GR_GL_FUNCTION_TYPE nullGLStencilFunc(GrGLenum func, GrGLint ref, GrGLuint mask) {}
GrGLvoid GR_GL_FUNCTION_TYPE nullGLStencilFuncSeparate(GrGLenum face, GrGLenum func, GrGLint ref, GrGLuint mask) {}
@ -62,8 +53,6 @@ GrGLvoid GR_GL_FUNCTION_TYPE nullGLStencilMask(GrGLuint mask) {}
GrGLvoid GR_GL_FUNCTION_TYPE nullGLStencilMaskSeparate(GrGLenum face, GrGLuint mask) {}
GrGLvoid GR_GL_FUNCTION_TYPE nullGLStencilOp(GrGLenum fail, GrGLenum zfail, GrGLenum zpass) {}
GrGLvoid GR_GL_FUNCTION_TYPE nullGLStencilOpSeparate(GrGLenum face, GrGLenum fail, GrGLenum zfail, GrGLenum zpass) {}
GrGLvoid GR_GL_FUNCTION_TYPE nullGLTexCoordPointer(GrGLint size, GrGLenum type, GrGLsizei stride, const GrGLvoid* pointer) {}
GrGLvoid GR_GL_FUNCTION_TYPE nullGLTexEnvi(GrGLenum target, GrGLenum pname, GrGLint param) {}
GrGLvoid GR_GL_FUNCTION_TYPE nullGLTexImage2D(GrGLenum target, GrGLint level, GrGLint internalformat, GrGLsizei width, GrGLsizei height, GrGLint border, GrGLenum format, GrGLenum type, const GrGLvoid* pixels) {}
GrGLvoid GR_GL_FUNCTION_TYPE nullGLTexParameteri(GrGLenum target, GrGLenum pname, GrGLint param) {}
GrGLvoid GR_GL_FUNCTION_TYPE nullGLTexSubImage2D(GrGLenum target, GrGLint level, GrGLint xoffset, GrGLint yoffset, GrGLsizei width, GrGLsizei height, GrGLenum format, GrGLenum type, const GrGLvoid* pixels) {}
@ -89,7 +78,6 @@ GrGLvoid GR_GL_FUNCTION_TYPE nullGLUniformMatrix4fv(GrGLint location, GrGLsizei
GrGLvoid GR_GL_FUNCTION_TYPE nullGLUseProgram(GrGLuint program) {}
GrGLvoid GR_GL_FUNCTION_TYPE nullGLVertexAttrib4fv(GrGLuint indx, const GrGLfloat* values) {}
GrGLvoid GR_GL_FUNCTION_TYPE nullGLVertexAttribPointer(GrGLuint indx, GrGLint size, GrGLenum type, GrGLboolean normalized, GrGLsizei stride, const GrGLvoid* ptr) {}
GrGLvoid GR_GL_FUNCTION_TYPE nullGLVertexPointer(GrGLint size, GrGLenum type, GrGLsizei stride, const GrGLvoid* pointer) {}
GrGLvoid GR_GL_FUNCTION_TYPE nullGLViewport(GrGLint x, GrGLint y, GrGLsizei width, GrGLsizei height) {}
GrGLvoid GR_GL_FUNCTION_TYPE nullGLBindFramebuffer(GrGLenum target, GrGLuint framebuffer) {}
GrGLvoid GR_GL_FUNCTION_TYPE nullGLBindRenderbuffer(GrGLenum target, GrGLuint renderbuffer) {}
@ -410,10 +398,7 @@ const GrGLInterface* GrGLCreateNullInterface() {
interface->fClear = nullGLClear;
interface->fClearColor = nullGLClearColor;
interface->fClearStencil = nullGLClearStencil;
interface->fClientActiveTexture = nullGLClientActiveTexture;
interface->fColor4ub = nullGLColor4ub;
interface->fColorMask = nullGLColorMask;
interface->fColorPointer = nullGLColorPointer;
interface->fCompileShader = nullGLCompileShader;
interface->fCompressedTexImage2D = nullGLCompressedTexImage2D;
interface->fCreateProgram = nullGLCreateProgram;
@ -426,14 +411,12 @@ const GrGLInterface* GrGLCreateNullInterface() {
interface->fDeleteTextures = nullGLDeleteIds;
interface->fDepthMask = nullGLDepthMask;
interface->fDisable = nullGLDisable;
interface->fDisableClientState = nullGLDisableClientState;
interface->fDisableVertexAttribArray = nullGLDisableVertexAttribArray;
interface->fDrawArrays = nullGLDrawArrays;
interface->fDrawBuffer = nullGLDrawBuffer;
interface->fDrawBuffers = nullGLDrawBuffers;
interface->fDrawElements = nullGLDrawElements;
interface->fEnable = nullGLEnable;
interface->fEnableClientState = nullGLEnableClientState;
interface->fEnableVertexAttribArray = nullGLEnableVertexAttribArray;
interface->fEndQuery = nullGLEndQuery;
interface->fFinish = nullGLFinish;
@ -459,15 +442,11 @@ const GrGLInterface* GrGLCreateNullInterface() {
interface->fGetUniformLocation = nullGLGetUniformLocation;
interface->fLineWidth = nullGLLineWidth;
interface->fLinkProgram = nullGLLinkProgram;
interface->fLoadMatrixf = nullGLLoadMatrixf;
interface->fMatrixMode = nullGLMatrixMode;
interface->fPixelStorei = nullGLPixelStorei;
interface->fPointSize = nullGLPointSize;
interface->fQueryCounter = nullGLQueryCounter;
interface->fReadBuffer = nullGLReadBuffer;
interface->fReadPixels = nullGLReadPixels;
interface->fScissor = nullGLScissor;
interface->fShadeModel = nullGLShadeModel;
interface->fShaderSource = nullGLShaderSource;
interface->fStencilFunc = nullGLStencilFunc;
interface->fStencilFuncSeparate = nullGLStencilFuncSeparate;
@ -475,8 +454,6 @@ const GrGLInterface* GrGLCreateNullInterface() {
interface->fStencilMaskSeparate = nullGLStencilMaskSeparate;
interface->fStencilOp = nullGLStencilOp;
interface->fStencilOpSeparate = nullGLStencilOpSeparate;
interface->fTexCoordPointer = nullGLTexCoordPointer;
interface->fTexEnvi = nullGLTexEnvi;
interface->fTexImage2D = nullGLTexImage2D;
interface->fTexParameteri = nullGLTexParameteri;
interface->fTexSubImage2D = nullGLTexSubImage2D;
@ -502,7 +479,6 @@ const GrGLInterface* GrGLCreateNullInterface() {
interface->fUseProgram = nullGLUseProgram;
interface->fVertexAttrib4fv = nullGLVertexAttrib4fv;
interface->fVertexAttribPointer = nullGLVertexAttribPointer;
interface->fVertexPointer = nullGLVertexPointer;
interface->fViewport = nullGLViewport;
interface->fBindFramebuffer = nullGLBindFramebuffer;
interface->fBindRenderbuffer = nullGLBindRenderbuffer;

11
src/gpu/GrGLInterface.cpp
View File

@ -122,8 +122,6 @@ GrGLInterface::GrGLInterface() {
fClear = NULL;
fClearColor = NULL;
fClearStencil = NULL;
fClientActiveTexture = NULL;
fColor4ub = NULL;
fColorMask = NULL;
fColorPointer = NULL;
fCompileShader = NULL;
@ -138,7 +136,6 @@ GrGLInterface::GrGLInterface() {
fDeleteTextures = NULL;
fDepthMask = NULL;
fDisable = NULL;
fDisableClientState = NULL;
fDisableVertexAttribArray = NULL;
fDrawArrays = NULL;
fDrawBuffer = NULL;
@ -148,7 +145,6 @@ GrGLInterface::GrGLInterface() {
fFinish = NULL;
fFlush = NULL;
fEnable = NULL;
fEnableClientState = NULL;
fEnableVertexAttribArray = NULL;
fFrontFace = NULL;
fGenBuffers = NULL;
@ -171,15 +167,11 @@ GrGLInterface::GrGLInterface() {
fGetUniformLocation = NULL;
fLineWidth = NULL;
fLinkProgram = NULL;
fLoadMatrixf = NULL;
fMatrixMode = NULL;
fPixelStorei = NULL;
fPointSize = NULL;
fQueryCounter = NULL;
fReadBuffer = NULL;
fReadPixels = NULL;
fScissor = NULL;
fShadeModel = NULL;
fShaderSource = NULL;
fStencilFunc = NULL;
fStencilFuncSeparate = NULL;
@ -187,8 +179,6 @@ GrGLInterface::GrGLInterface() {
fStencilMaskSeparate = NULL;
fStencilOp = NULL;
fStencilOpSeparate = NULL;
fTexCoordPointer = NULL;
fTexEnvi = NULL;
fTexImage2D = NULL;
fTexParameteri = NULL;
fTexSubImage2D = NULL;
@ -214,7 +204,6 @@ GrGLInterface::GrGLInterface() {
fUseProgram = NULL;
fVertexAttrib4fv = NULL;
fVertexAttribPointer = NULL;
fVertexPointer = NULL;
fViewport = NULL;
fBindFramebuffer = NULL;
fBindRenderbuffer = NULL;

11
src/gpu/ios/GrGLDefaultInterface_iOS.cpp
View File

@ -33,10 +33,8 @@ const GrGLInterface* GrGLDefaultInterface() {
interface->fClear = glClear;
interface->fClearColor = glClearColor;
interface->fClearStencil = glClearStencil;
interface->fClientActiveTexture = glClientActiveTexture;
interface->fColorMask = glColorMask;
interface->fColorPointer = glColorPointer;
interface->fColor4ub = glColor4ub;
interface->fCompileShader = glCompileShader;
interface->fCompressedTexImage2D = glCompressedTexImage2D;
interface->fCreateProgram = glCreateProgram;
@ -48,14 +46,12 @@ const GrGLInterface* GrGLDefaultInterface() {
interface->fDeleteTextures = glDeleteTextures;
interface->fDepthMask = glDepthMask;
interface->fDisable = glDisable;
interface->fDisableClientState = glDisableClientState;
interface->fDisableVertexAttribArray = glDisableVertexAttribArray;
interface->fDrawArrays = glDrawArrays;
interface->fDrawBuffer = NULL;
interface->fDrawBuffers = NULL;
interface->fDrawElements = glDrawElements;
interface->fEnable = glEnable;
interface->fEnableClientState = glEnableClientState;
interface->fEnableVertexAttribArray = glEnableVertexAttribArray;
interface->fFrontFace = glFrontFace;
interface->fGenBuffers = glGenBuffers;
@ -71,14 +67,10 @@ const GrGLInterface* GrGLDefaultInterface() {
interface->fGetUniformLocation = glGetUniformLocation;
interface->fLineWidth = glLineWidth;
interface->fLinkProgram = glLinkProgram;
interface->fLoadMatrixf = glLoadMatrixf;
interface->fMatrixMode = glMatrixMode;
interface->fPointSize = glPointSize;
interface->fPixelStorei = glPixelStorei;
interface->fReadBuffer = NULL;
interface->fReadPixels = glReadPixels;
interface->fScissor = glScissor;
interface->fShadeModel = glShadeModel;
interface->fShaderSource = glShaderSource;
interface->fStencilFunc = glStencilFunc;
interface->fStencilFuncSeparate = glStencilFuncSeparate;
@ -86,8 +78,6 @@ const GrGLInterface* GrGLDefaultInterface() {
interface->fStencilMaskSeparate = glStencilMaskSeparate;
interface->fStencilOp = glStencilOp;
interface->fStencilOpSeparate = glStencilOpSeparate;
interface->fTexCoordPointer = glTexCoordPointer;
interface->fTexEnvi = glTexEnvi;
// mac uses GLenum for internalFormat param (non-standard)
// amounts to int vs. uint.
interface->fTexImage2D = (GrGLTexImage2DProc)glTexImage2D;
@ -116,7 +106,6 @@ const GrGLInterface* GrGLDefaultInterface() {
interface->fUseProgram = glUseProgram;
interface->fVertexAttrib4fv = glVertexAttrib4fv;
interface->fVertexAttribPointer = glVertexAttribPointer;
interface->fVertexPointer = glVertexPointer;
interface->fViewport = glViewport;
interface->fGenFramebuffers = glGenFramebuffers;
interface->fGetFramebufferAttachmentParameteriv = glGetFramebufferAttachmentParameteriv;

11
src/gpu/mac/GrGLCreateNativeInterface_mac.cpp
View File

@ -59,10 +59,8 @@ const GrGLInterface* GrGLCreateNativeInterface() {
interface->fClear = glClear;
interface->fClearColor = glClearColor;
interface->fClearStencil = glClearStencil;
interface->fClientActiveTexture = glClientActiveTexture;
interface->fColorMask = glColorMask;
interface->fColorPointer = glColorPointer;
interface->fColor4ub = glColor4ub;
interface->fCompileShader = glCompileShader;
interface->fCompressedTexImage2D = glCompressedTexImage2D;
interface->fCreateProgram = glCreateProgram;
@ -75,7 +73,6 @@ const GrGLInterface* GrGLCreateNativeInterface() {
interface->fDeleteTextures = glDeleteTextures;
interface->fDepthMask = glDepthMask;
interface->fDisable = glDisable;
interface->fDisableClientState = glDisableClientState;
interface->fDisableVertexAttribArray =
glDisableVertexAttribArray;
interface->fDrawArrays = glDrawArrays;
@ -83,7 +80,6 @@ const GrGLInterface* GrGLCreateNativeInterface() {
interface->fDrawBuffers = glDrawBuffers;
interface->fDrawElements = glDrawElements;
interface->fEnable = glEnable;
interface->fEnableClientState = glEnableClientState;
interface->fEnableVertexAttribArray = glEnableVertexAttribArray;
interface->fEndQuery = glEndQuery;
interface->fFinish = glFinish;
@ -107,15 +103,11 @@ const GrGLInterface* GrGLCreateNativeInterface() {
interface->fGetUniformLocation = glGetUniformLocation;
interface->fLineWidth = glLineWidth;
interface->fLinkProgram = glLinkProgram;
interface->fLoadMatrixf = glLoadMatrixf;
interface->fMapBuffer = glMapBuffer;
interface->fMatrixMode = glMatrixMode;
interface->fPointSize = glPointSize;
interface->fPixelStorei = glPixelStorei;
interface->fReadBuffer = glReadBuffer;
interface->fReadPixels = glReadPixels;
interface->fScissor = glScissor;
interface->fShadeModel = glShadeModel;
interface->fShaderSource = glShaderSource;
interface->fStencilFunc = glStencilFunc;
interface->fStencilFuncSeparate = glStencilFuncSeparate;
@ -123,8 +115,6 @@ const GrGLInterface* GrGLCreateNativeInterface() {
interface->fStencilMaskSeparate = glStencilMaskSeparate;
interface->fStencilOp = glStencilOp;
interface->fStencilOpSeparate = glStencilOpSeparate;
interface->fTexCoordPointer = glTexCoordPointer;
interface->fTexEnvi = glTexEnvi;
// mac uses GLenum for internalFormat param (non-standard)
// amounts to int vs. uint.
interface->fTexImage2D = (GrGLTexImage2DProc)glTexImage2D;
@ -154,7 +144,6 @@ const GrGLInterface* GrGLCreateNativeInterface() {
interface->fUseProgram = glUseProgram;
interface->fVertexAttrib4fv = glVertexAttrib4fv;
interface->fVertexAttribPointer = glVertexAttribPointer;
interface->fVertexPointer = glVertexPointer;
interface->fViewport = glViewport;
if (ver >= GR_GL_VER(3,3) || GrGLHasExtensionFromString("GL_ARB_timer_query", extStr)) {

12
src/gpu/mesa/GrGLCreateMesaInterface.cpp
View File

@ -50,10 +50,7 @@ const GrGLInterface* GrGLCreateMesaInterface() {
GR_GL_GET_PROC(Clear);
GR_GL_GET_PROC(ClearColor);
GR_GL_GET_PROC(ClearStencil);
GR_GL_GET_PROC(ClientActiveTexture);
GR_GL_GET_PROC(ColorMask);
GR_GL_GET_PROC(ColorPointer);
GR_GL_GET_PROC(Color4ub);
GR_GL_GET_PROC(CompileShader);
GR_GL_GET_PROC(CompressedTexImage2D);
GR_GL_GET_PROC(CreateProgram);
@ -66,14 +63,12 @@ const GrGLInterface* GrGLCreateMesaInterface() {
GR_GL_GET_PROC(DeleteTextures);
GR_GL_GET_PROC(DepthMask);
GR_GL_GET_PROC(Disable);
GR_GL_GET_PROC(DisableClientState);
GR_GL_GET_PROC(DisableVertexAttribArray);
GR_GL_GET_PROC(DrawArrays);
GR_GL_GET_PROC(DrawBuffer);
GR_GL_GET_PROC(DrawBuffers);
GR_GL_GET_PROC(DrawElements);
GR_GL_GET_PROC(Enable);
GR_GL_GET_PROC(EnableClientState);
GR_GL_GET_PROC(EnableVertexAttribArray);
GR_GL_GET_PROC(EndQuery);
GR_GL_GET_PROC(Finish);
@ -106,15 +101,11 @@ const GrGLInterface* GrGLCreateMesaInterface() {
GR_GL_GET_PROC(GetUniformLocation);
GR_GL_GET_PROC(LineWidth);
GR_GL_GET_PROC(LinkProgram);
GR_GL_GET_PROC(LoadMatrixf);
GR_GL_GET_PROC(MapBuffer);
GR_GL_GET_PROC(MatrixMode);
GR_GL_GET_PROC(PointSize);
GR_GL_GET_PROC(PixelStorei);
GR_GL_GET_PROC(ReadBuffer);
GR_GL_GET_PROC(ReadPixels);
GR_GL_GET_PROC(Scissor);
GR_GL_GET_PROC(ShadeModel);
GR_GL_GET_PROC(ShaderSource);
GR_GL_GET_PROC(StencilFunc);
GR_GL_GET_PROC(StencilFuncSeparate);
@ -122,8 +113,6 @@ const GrGLInterface* GrGLCreateMesaInterface() {
GR_GL_GET_PROC(StencilMaskSeparate);
GR_GL_GET_PROC(StencilOp);
GR_GL_GET_PROC(StencilOpSeparate);
GR_GL_GET_PROC(TexCoordPointer);
GR_GL_GET_PROC(TexEnvi);
GR_GL_GET_PROC(TexImage2D)
GR_GL_GET_PROC(TexParameteri);
GR_GL_GET_PROC(TexSubImage2D);
@ -150,7 +139,6 @@ const GrGLInterface* GrGLCreateMesaInterface() {
GR_GL_GET_PROC(UseProgram);
GR_GL_GET_PROC(VertexAttrib4fv);
GR_GL_GET_PROC(VertexAttribPointer);
GR_GL_GET_PROC(VertexPointer);
GR_GL_GET_PROC(Viewport);
// First look for GL3.0 FBO or GL_ARB_framebuffer_object (same since

11
src/gpu/unix/GrGLCreateNativeInterface_unix.cpp
View File

@ -50,10 +50,8 @@ const GrGLInterface* GrGLCreateNativeInterface() {
interface->fClear = glClear;
interface->fClearColor = glClearColor;
interface->fClearStencil = glClearStencil;
interface->fClientActiveTexture = glClientActiveTexture;
interface->fColorMask = glColorMask;
interface->fColorPointer = glColorPointer;
interface->fColor4ub = glColor4ub;
GR_GL_GET_PROC(CompileShader);
interface->fCompressedTexImage2D = glCompressedTexImage2D;
GR_GL_GET_PROC(CreateProgram);
@ -66,14 +64,12 @@ const GrGLInterface* GrGLCreateNativeInterface() {
interface->fDeleteTextures = glDeleteTextures;
interface->fDepthMask = glDepthMask;
interface->fDisable = glDisable;
interface->fDisableClientState = glDisableClientState;
GR_GL_GET_PROC(DisableVertexAttribArray);
interface->fDrawArrays = glDrawArrays;
interface->fDrawBuffer = glDrawBuffer;
GR_GL_GET_PROC(DrawBuffers);
interface->fDrawElements = glDrawElements;
interface->fEnable = glEnable;
interface->fEnableClientState = glEnableClientState;
GR_GL_GET_PROC(EnableVertexAttribArray);
GR_GL_GET_PROC(EndQuery);
interface->fFinish = glFinish;
@ -106,15 +102,11 @@ const GrGLInterface* GrGLCreateNativeInterface() {
GR_GL_GET_PROC(GetUniformLocation);
interface->fLineWidth = glLineWidth;
GR_GL_GET_PROC(LinkProgram);
interface->fLoadMatrixf = glLoadMatrixf;
GR_GL_GET_PROC(MapBuffer);
interface->fMatrixMode = glMatrixMode;
interface->fPointSize = glPointSize;
interface->fPixelStorei = glPixelStorei;
interface->fReadBuffer = glReadBuffer;
interface->fReadPixels = glReadPixels;
interface->fScissor = glScissor;
interface->fShadeModel = glShadeModel;
GR_GL_GET_PROC(ShaderSource);
interface->fStencilFunc = glStencilFunc;
GR_GL_GET_PROC(StencilFuncSeparate);
@ -122,8 +114,6 @@ const GrGLInterface* GrGLCreateNativeInterface() {
GR_GL_GET_PROC(StencilMaskSeparate);
interface->fStencilOp = glStencilOp;
GR_GL_GET_PROC(StencilOpSeparate);
interface->fTexCoordPointer = glTexCoordPointer;
interface->fTexEnvi = glTexEnvi;
interface->fTexImage2D = glTexImage2D;
interface->fTexParameteri = glTexParameteri;
interface->fTexSubImage2D = glTexSubImage2D;
@ -150,7 +140,6 @@ const GrGLInterface* GrGLCreateNativeInterface() {
GR_GL_GET_PROC(UseProgram);
GR_GL_GET_PROC(VertexAttrib4fv);
GR_GL_GET_PROC(VertexAttribPointer);
interface->fVertexPointer = glVertexPointer;
interface->fViewport = glViewport;
GR_GL_GET_PROC(BindFragDataLocationIndexed);

11
src/gpu/win/GrGLCreateNativeInterface_win.cpp
View File

@ -48,19 +48,16 @@ const GrGLInterface* GrGLCreateNativeInterface() {
interface->fClear = glClear;
interface->fClearColor = glClearColor;
interface->fClearStencil = glClearStencil;
interface->fColor4ub = glColor4ub;
interface->fColorMask = glColorMask;
interface->fColorPointer = glColorPointer;
interface->fCullFace = glCullFace;
interface->fDeleteTextures = glDeleteTextures;
interface->fDepthMask = glDepthMask;
interface->fDisable = glDisable;
interface->fDisableClientState = glDisableClientState;
interface->fDrawArrays = glDrawArrays;
interface->fDrawElements = glDrawElements;
interface->fDrawBuffer = glDrawBuffer;
interface->fEnable = glEnable;
interface->fEnableClientState = glEnableClientState;
interface->fFrontFace = glFrontFace;
interface->fFinish = glFinish;
interface->fFlush = glFlush;
@ -70,24 +67,17 @@ const GrGLInterface* GrGLCreateNativeInterface() {
interface->fGetString = glGetString;
interface->fGetTexLevelParameteriv = glGetTexLevelParameteriv;
interface->fLineWidth = glLineWidth;
interface->fLoadMatrixf = glLoadMatrixf;
interface->fMatrixMode = glMatrixMode;
interface->fPixelStorei = glPixelStorei;
interface->fPointSize = glPointSize;
interface->fReadBuffer = glReadBuffer;
interface->fReadPixels = glReadPixels;
interface->fScissor = glScissor;
interface->fShadeModel = glShadeModel;
interface->fStencilFunc = glStencilFunc;
interface->fStencilMask = glStencilMask;
interface->fStencilOp = glStencilOp;
interface->fTexImage2D = glTexImage2D;
interface->fTexParameteri = glTexParameteri;
interface->fTexCoordPointer = glTexCoordPointer;
interface->fTexEnvi = glTexEnvi;
interface->fTexSubImage2D = glTexSubImage2D;
interface->fViewport = glViewport;
interface->fVertexPointer = glVertexPointer;
GR_GL_GET_PROC(ActiveTexture);
GR_GL_GET_PROC(AttachShader);
@ -98,7 +88,6 @@ const GrGLInterface* GrGLCreateNativeInterface() {
GR_GL_GET_PROC(BlendColor);
GR_GL_GET_PROC(BufferData);
GR_GL_GET_PROC(BufferSubData);
GR_GL_GET_PROC(ClientActiveTexture);
GR_GL_GET_PROC(CompileShader);
GR_GL_GET_PROC(CompressedTexImage2D);
GR_GL_GET_PROC(CreateProgram);