Remove EXT_direct_state_access (unused)
Change-Id: I501fab7be512f5a0c4b26d666bbf883de4b73a59
Reviewed-on: https://skia-review.googlesource.com/105902
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
diff --git a/include/gpu/gl/GrGLFunctions.h b/include/gpu/gl/GrGLFunctions.h
index 3ccfb62..4933e50 100644
--- a/include/gpu/gl/GrGLFunctions.h
+++ b/include/gpu/gl/GrGLFunctions.h
@@ -248,111 +248,6 @@
/* ARB_sample_shading */
typedef GrGLvoid (* GrGLMinSampleShadingProc)(GrGLfloat value);
-/* EXT_direct_state_access */
-// (In the future some of these methods may be omitted)
-typedef GrGLvoid (* GrGLTextureParameteriProc)(GrGLuint texture, GrGLenum target, GrGLenum pname, GrGLint param);
-typedef GrGLvoid (* GrGLTextureParameterivProc)(GrGLuint texture, GrGLenum target, GrGLenum pname, const GrGLint *param);
-typedef GrGLvoid (* GrGLTextureParameterfProc)(GrGLuint texture, GrGLenum target, GrGLenum pname, float param);
-typedef GrGLvoid (* GrGLTextureParameterfvProc)(GrGLuint texture, GrGLenum target, GrGLenum pname, const float *param);
-typedef GrGLvoid (* GrGLTextureImage1DProc)(GrGLuint texture, GrGLenum target, GrGLint level, GrGLint GrGLinternalformat, GrGLsizei width, GrGLint border, GrGLenum format, GrGLenum type, const GrGLvoid *pixels);
-typedef GrGLvoid (* GrGLTextureImage2DProc)(GrGLuint texture, GrGLenum target, GrGLint level, GrGLint GrGLinternalformat, GrGLsizei width, GrGLsizei height, GrGLint border, GrGLenum format, GrGLenum type, const GrGLvoid *pixels);
-typedef GrGLvoid (* GrGLTextureSubImage1DProc)(GrGLuint texture, GrGLenum target, GrGLint level, GrGLint xoffset, GrGLsizei width, GrGLenum format, GrGLenum type, const GrGLvoid *pixels);
-typedef GrGLvoid (* GrGLTextureSubImage2DProc)(GrGLuint texture, GrGLenum target, GrGLint level, GrGLint xoffset, GrGLint yoffset, GrGLsizei width, GrGLsizei height, GrGLenum format, GrGLenum type, const GrGLvoid *pixels);
-typedef GrGLvoid (* GrGLCopyTextureImage1DProc)(GrGLuint texture, GrGLenum target, GrGLint level, GrGLenum GrGLinternalformat, GrGLint x, GrGLint y, GrGLsizei width, GrGLint border);
-typedef GrGLvoid (* GrGLCopyTextureImage2DProc)(GrGLuint texture, GrGLenum target, GrGLint level, GrGLenum GrGLinternalformat, GrGLint x, GrGLint y, GrGLsizei width, GrGLsizei height, GrGLint border);
-typedef GrGLvoid (* GrGLCopyTextureSubImage1DProc)(GrGLuint texture, GrGLenum target, GrGLint level, GrGLint xoffset, GrGLint x, GrGLint y, GrGLsizei width);
-typedef GrGLvoid (* GrGLCopyTextureSubImage2DProc)(GrGLuint texture, GrGLenum target, GrGLint level, GrGLint xoffset, GrGLint yoffset, GrGLint x, GrGLint y, GrGLsizei width, GrGLsizei height);
-typedef GrGLvoid (* GrGLGetTextureImageProc)(GrGLuint texture, GrGLenum target, GrGLint level, GrGLenum format, GrGLenum type, GrGLvoid *pixels);
-typedef GrGLvoid (* GrGLGetTextureParameterfvProc)(GrGLuint texture, GrGLenum target, GrGLenum pname, float *params);
-typedef GrGLvoid (* GrGLGetTextureParameterivProc)(GrGLuint texture, GrGLenum target, GrGLenum pname, GrGLint *params);
-typedef GrGLvoid (* GrGLGetTextureLevelParameterfvProc)(GrGLuint texture, GrGLenum target, GrGLint level, GrGLenum pname, float *params);
-typedef GrGLvoid (* GrGLGetTextureLevelParameterivProc)(GrGLuint texture, GrGLenum target, GrGLint level, GrGLenum pname, GrGLint *params);
-// OpenGL 1.2
-typedef GrGLvoid (* GrGLTextureImage3DProc)(GrGLuint texture, GrGLenum target, GrGLint level, GrGLint GrGLinternalformat, GrGLsizei width, GrGLsizei height, GrGLsizei depth, GrGLint border, GrGLenum format, GrGLenum type, const GrGLvoid *pixels);
-typedef GrGLvoid (* GrGLTextureSubImage3DProc)(GrGLuint texture, GrGLenum target, GrGLint level, GrGLint xoffset, GrGLint yoffset, GrGLint zoffset, GrGLsizei width, GrGLsizei height, GrGLsizei depth, GrGLenum format, GrGLenum type, const GrGLvoid *pixels);
-typedef GrGLvoid (* GrGLCopyTextureSubImage3DProc)(GrGLuint texture, GrGLenum target, GrGLint level, GrGLint xoffset, GrGLint yoffset, GrGLint zoffset, GrGLint x, GrGLint y, GrGLsizei width, GrGLsizei height);
-typedef GrGLvoid (* GrGLCompressedTextureImage3DProc)(GrGLuint texture, GrGLenum target, GrGLint level, GrGLenum GrGLinternalformat, GrGLsizei width, GrGLsizei height, GrGLsizei depth, GrGLint border, GrGLsizei imageSize, const GrGLvoid *data);
-typedef GrGLvoid (* GrGLCompressedTextureImage2DProc)(GrGLuint texture, GrGLenum target, GrGLint level, GrGLenum GrGLinternalformat, GrGLsizei width, GrGLsizei height, GrGLint border, GrGLsizei imageSize, const GrGLvoid *data);
-typedef GrGLvoid (* GrGLCompressedTextureImage1DProc)(GrGLuint texture, GrGLenum target, GrGLint level, GrGLenum GrGLinternalformat, GrGLsizei width, GrGLint border, GrGLsizei imageSize, const GrGLvoid *data);
-typedef GrGLvoid (* GrGLCompressedTextureSubImage3DProc)(GrGLuint texture, GrGLenum target, GrGLint level, GrGLint xoffset, GrGLint yoffset, GrGLint zoffset, GrGLsizei width, GrGLsizei height, GrGLsizei depth, GrGLenum format, GrGLsizei imageSize, const GrGLvoid *data);
-typedef GrGLvoid (* GrGLCompressedTextureSubImage2DProc)(GrGLuint texture, GrGLenum target, GrGLint level, GrGLint xoffset, GrGLint yoffset, GrGLsizei width, GrGLsizei height, GrGLenum format, GrGLsizei imageSize, const GrGLvoid *data);
-typedef GrGLvoid (* GrGLCompressedTextureSubImage1DProc)(GrGLuint texture, GrGLenum target, GrGLint level, GrGLint xoffset, GrGLsizei width, GrGLenum format, GrGLsizei imageSize, const GrGLvoid *data);
-typedef GrGLvoid (* GrGLGetCompressedTextureImageProc)(GrGLuint texture, GrGLenum target, GrGLint level, GrGLvoid *img);
-// OpenGL 1.5
-typedef GrGLvoid (* GrGLNamedBufferDataProc)(GrGLuint buffer, GrGLsizeiptr size, const GrGLvoid *data, GrGLenum usage);
-typedef GrGLvoid (* GrGLNamedBufferSubDataProc)(GrGLuint buffer, GrGLintptr offset, GrGLsizeiptr size, const GrGLvoid *data);
-typedef GrGLvoid* (* GrGLMapNamedBufferProc)(GrGLuint buffer, GrGLenum access);
-typedef GrGLboolean (* GrGLUnmapNamedBufferProc)(GrGLuint buffer);
-typedef GrGLvoid (* GrGLGetNamedBufferParameterivProc)(GrGLuint buffer, GrGLenum pname, GrGLint *params);
-typedef GrGLvoid (* GrGLGetNamedBufferPointervProc)(GrGLuint buffer, GrGLenum pname, GrGLvoid* *params);
-typedef GrGLvoid (* GrGLGetNamedBufferSubDataProc)(GrGLuint buffer, GrGLintptr offset, GrGLsizeiptr size, GrGLvoid *data);
-// OpenGL 2.0
-typedef GrGLvoid (* GrGLProgramUniform1fProc)(GrGLuint program, GrGLint location, float v0);
-typedef GrGLvoid (* GrGLProgramUniform2fProc)(GrGLuint program, GrGLint location, float v0, float v1);
-typedef GrGLvoid (* GrGLProgramUniform3fProc)(GrGLuint program, GrGLint location, float v0, float v1, float v2);
-typedef GrGLvoid (* GrGLProgramUniform4fProc)(GrGLuint program, GrGLint location, float v0, float v1, float v2, float v3);
-typedef GrGLvoid (* GrGLProgramUniform1iProc)(GrGLuint program, GrGLint location, GrGLint v0);
-typedef GrGLvoid (* GrGLProgramUniform2iProc)(GrGLuint program, GrGLint location, GrGLint v0, GrGLint v1);
-typedef GrGLvoid (* GrGLProgramUniform3iProc)(GrGLuint program, GrGLint location, GrGLint v0, GrGLint v1, GrGLint v2);
-typedef GrGLvoid (* GrGLProgramUniform4iProc)(GrGLuint program, GrGLint location, GrGLint v0, GrGLint v1, GrGLint v2, GrGLint v3);
-typedef GrGLvoid (* GrGLProgramUniform1fvProc)(GrGLuint program, GrGLint location, GrGLsizei count, const float *value);
-typedef GrGLvoid (* GrGLProgramUniform2fvProc)(GrGLuint program, GrGLint location, GrGLsizei count, const float *value);
-typedef GrGLvoid (* GrGLProgramUniform3fvProc)(GrGLuint program, GrGLint location, GrGLsizei count, const float *value);
-typedef GrGLvoid (* GrGLProgramUniform4fvProc)(GrGLuint program, GrGLint location, GrGLsizei count, const float *value);
-typedef GrGLvoid (* GrGLProgramUniform1ivProc)(GrGLuint program, GrGLint location, GrGLsizei count, const GrGLint *value);
-typedef GrGLvoid (* GrGLProgramUniform2ivProc)(GrGLuint program, GrGLint location, GrGLsizei count, const GrGLint *value);
-typedef GrGLvoid (* GrGLProgramUniform3ivProc)(GrGLuint program, GrGLint location, GrGLsizei count, const GrGLint *value);
-typedef GrGLvoid (* GrGLProgramUniform4ivProc)(GrGLuint program, GrGLint location, GrGLsizei count, const GrGLint *value);
-typedef GrGLvoid (* GrGLProgramUniformMatrix2fvProc)(GrGLuint program, GrGLint location, GrGLsizei count, GrGLboolean transpose, const float *value);
-typedef GrGLvoid (* GrGLProgramUniformMatrix3fvProc)(GrGLuint program, GrGLint location, GrGLsizei count, GrGLboolean transpose, const float *value);
-typedef GrGLvoid (* GrGLProgramUniformMatrix4fvProc)(GrGLuint program, GrGLint location, GrGLsizei count, GrGLboolean transpose, const float *value);
-// OpenGL 2.1
-typedef GrGLvoid (* GrGLProgramUniformMatrix2x3fvProc)(GrGLuint program, GrGLint location, GrGLsizei count, GrGLboolean transpose, const float *value);
-typedef GrGLvoid (* GrGLProgramUniformMatrix3x2fvProc)(GrGLuint program, GrGLint location, GrGLsizei count, GrGLboolean transpose, const float *value);
-typedef GrGLvoid (* GrGLProgramUniformMatrix2x4fvProc)(GrGLuint program, GrGLint location, GrGLsizei count, GrGLboolean transpose, const float *value);
-typedef GrGLvoid (* GrGLProgramUniformMatrix4x2fvProc)(GrGLuint program, GrGLint location, GrGLsizei count, GrGLboolean transpose, const float *value);
-typedef GrGLvoid (* GrGLProgramUniformMatrix3x4fvProc)(GrGLuint program, GrGLint location, GrGLsizei count, GrGLboolean transpose, const float *value);
-typedef GrGLvoid (* GrGLProgramUniformMatrix4x3fvProc)(GrGLuint program, GrGLint location, GrGLsizei count, GrGLboolean transpose, const float *value);
-// OpenGL 3.0
-typedef GrGLvoid (* GrGLNamedRenderbufferStorageProc)(GrGLuint renderbuffer, GrGLenum GrGLinternalformat, GrGLsizei width, GrGLsizei height);
-typedef GrGLvoid (* GrGLGetNamedRenderbufferParameterivProc)(GrGLuint renderbuffer, GrGLenum pname, GrGLint *params);
-typedef GrGLvoid (* GrGLNamedRenderbufferStorageMultisampleProc)(GrGLuint renderbuffer, GrGLsizei samples, GrGLenum GrGLinternalformat, GrGLsizei width, GrGLsizei height);
-typedef GrGLenum (* GrGLCheckNamedFramebufferStatusProc)(GrGLuint framebuffer, GrGLenum target);
-typedef GrGLvoid (* GrGLNamedFramebufferTexture1DProc)(GrGLuint framebuffer, GrGLenum attachment, GrGLenum textarget, GrGLuint texture, GrGLint level);
-typedef GrGLvoid (* GrGLNamedFramebufferTexture2DProc)(GrGLuint framebuffer, GrGLenum attachment, GrGLenum textarget, GrGLuint texture, GrGLint level);
-typedef GrGLvoid (* GrGLNamedFramebufferTexture3DProc)(GrGLuint framebuffer, GrGLenum attachment, GrGLenum textarget, GrGLuint texture, GrGLint level, GrGLint zoffset);
-typedef GrGLvoid (* GrGLNamedFramebufferRenderbufferProc)(GrGLuint framebuffer, GrGLenum attachment, GrGLenum renderbuffertarget, GrGLuint renderbuffer);
-typedef GrGLvoid (* GrGLGetNamedFramebufferAttachmentParameterivProc)(GrGLuint framebuffer, GrGLenum attachment, GrGLenum pname, GrGLint *params);
-typedef GrGLvoid (* GrGLGenerateTextureMipmapProc)(GrGLuint texture, GrGLenum target);
-typedef GrGLvoid (* GrGLFramebufferDrawBufferProc)(GrGLuint framebuffer, GrGLenum mode);
-typedef GrGLvoid (* GrGLFramebufferDrawBuffersProc)(GrGLuint framebuffer, GrGLsizei n, const GrGLenum *bufs);
-typedef GrGLvoid (* GrGLFramebufferReadBufferProc)(GrGLuint framebuffer, GrGLenum mode);
-typedef GrGLvoid (* GrGLGetFramebufferParameterivProc)(GrGLuint framebuffer, GrGLenum pname, GrGLint *param);
-typedef GrGLvoid (* GrGLNamedCopyBufferSubDataProc)(GrGLuint readBuffer, GrGLuint writeBuffer, GrGLintptr readOffset, GrGLintptr writeOffset, GrGLsizeiptr size);
-typedef GrGLvoid (* GrGLVertexArrayVertexOffsetProc)(GrGLuint vaobj, GrGLuint buffer, GrGLint size, GrGLenum type, GrGLsizei stride, GrGLintptr offset);
-typedef GrGLvoid (* GrGLVertexArrayColorOffsetProc)(GrGLuint vaobj, GrGLuint buffer, GrGLint size, GrGLenum type, GrGLsizei stride, GrGLintptr offset);
-typedef GrGLvoid (* GrGLVertexArrayEdgeFlagOffsetProc)(GrGLuint vaobj, GrGLuint buffer, GrGLsizei stride, GrGLintptr offset);
-typedef GrGLvoid (* GrGLVertexArrayIndexOffsetProc)(GrGLuint vaobj, GrGLuint buffer, GrGLenum type, GrGLsizei stride, GrGLintptr offset);
-typedef GrGLvoid (* GrGLVertexArrayNormalOffsetProc)(GrGLuint vaobj, GrGLuint buffer, GrGLenum type, GrGLsizei stride, GrGLintptr offset);
-typedef GrGLvoid (* GrGLVertexArrayTexCoordOffsetProc)(GrGLuint vaobj, GrGLuint buffer, GrGLint size, GrGLenum type, GrGLsizei stride, GrGLintptr offset);
-typedef GrGLvoid (* GrGLVertexArrayMultiTexCoordOffsetProc)(GrGLuint vaobj, GrGLuint buffer, GrGLenum texunit, GrGLint size, GrGLenum type, GrGLsizei stride, GrGLintptr offset);
-typedef GrGLvoid (* GrGLVertexArrayFogCoordOffsetProc)(GrGLuint vaobj, GrGLuint buffer, GrGLenum type, GrGLsizei stride, GrGLintptr offset);
-typedef GrGLvoid (* GrGLVertexArraySecondaryColorOffsetProc)(GrGLuint vaobj, GrGLuint buffer, GrGLint size, GrGLenum type, GrGLsizei stride, GrGLintptr offset);
-typedef GrGLvoid (* GrGLVertexArrayVertexAttribOffsetProc)(GrGLuint vaobj, GrGLuint buffer, GrGLuint index, GrGLint size, GrGLenum type, GrGLboolean normalized, GrGLsizei stride, GrGLintptr offset);
-typedef GrGLvoid (* GrGLVertexArrayVertexAttribIOffsetProc)(GrGLuint vaobj, GrGLuint buffer, GrGLuint index, GrGLint size, GrGLenum type, GrGLsizei stride, GrGLintptr offset);
-typedef GrGLvoid (* GrGLEnableVertexArrayProc)(GrGLuint vaobj, GrGLenum array);
-typedef GrGLvoid (* GrGLDisableVertexArrayProc)(GrGLuint vaobj, GrGLenum array);
-typedef GrGLvoid (* GrGLEnableVertexArrayAttribProc)(GrGLuint vaobj, GrGLuint index);
-typedef GrGLvoid (* GrGLDisableVertexArrayAttribProc)(GrGLuint vaobj, GrGLuint index);
-typedef GrGLvoid (* GrGLGetVertexArrayIntegervProc)(GrGLuint vaobj, GrGLenum pname, GrGLint *param);
-typedef GrGLvoid (* GrGLGetVertexArrayPointervProc)(GrGLuint vaobj, GrGLenum pname, GrGLvoid **param);
-typedef GrGLvoid (* GrGLGetVertexArrayIntegeri_vProc)(GrGLuint vaobj, GrGLuint index, GrGLenum pname, GrGLint *param);
-typedef GrGLvoid (* GrGLGetVertexArrayPointeri_vProc)(GrGLuint vaobj, GrGLuint index, GrGLenum pname, GrGLvoid **param);
-typedef GrGLvoid* (* GrGLMapNamedBufferRangeProc)(GrGLuint buffer, GrGLintptr offset, GrGLsizeiptr length, GrGLbitfield access);
-typedef GrGLvoid (* GrGLFlushMappedNamedBufferRangeProc)(GrGLuint buffer, GrGLintptr offset, GrGLsizeiptr length);
-// OpenGL 3.1
-typedef GrGLvoid (* GrGLTextureBufferProc)(GrGLuint texture, GrGLenum target, GrGLenum internalformat, GrGLuint buffer);
-
/* ARB_sync */
typedef GrGLsync (* GrGLFenceSyncProc)(GrGLenum condition, GrGLbitfield flags);
typedef GrGLboolean (* GrGLIsSyncProc)(GrGLsync sync);
diff --git a/include/gpu/gl/GrGLInterface.h b/include/gpu/gl/GrGLInterface.h
index e6451ec..227c8ba 100644
--- a/include/gpu/gl/GrGLInterface.h
+++ b/include/gpu/gl/GrGLInterface.h
@@ -328,112 +328,6 @@
/* ARB_sample_shading */
GrGLFunction<GrGLMinSampleShadingProc> fMinSampleShading;
- /* EXT_direct_state_access */
- // We use the EXT verson because it is more expansive and interacts with more extensions
- // than the ARB or core (4.5) versions. We may switch and/or omit methods in the future.
- GrGLFunction<GrGLTextureParameteriProc> fTextureParameteri;
- GrGLFunction<GrGLTextureParameterivProc> fTextureParameteriv;
- GrGLFunction<GrGLTextureParameterfProc> fTextureParameterf;
- GrGLFunction<GrGLTextureParameterfvProc> fTextureParameterfv;
- GrGLFunction<GrGLTextureImage1DProc> fTextureImage1D;
- GrGLFunction<GrGLTextureImage2DProc> fTextureImage2D;
- GrGLFunction<GrGLTextureSubImage1DProc> fTextureSubImage1D;
- GrGLFunction<GrGLTextureSubImage2DProc> fTextureSubImage2D;
- GrGLFunction<GrGLCopyTextureImage1DProc> fCopyTextureImage1D;
- GrGLFunction<GrGLCopyTextureImage2DProc> fCopyTextureImage2D;
- GrGLFunction<GrGLCopyTextureSubImage1DProc> fCopyTextureSubImage1D;
- GrGLFunction<GrGLCopyTextureSubImage2DProc> fCopyTextureSubImage2D;
- GrGLFunction<GrGLGetTextureImageProc> fGetTextureImage;
- GrGLFunction<GrGLGetTextureParameterfvProc> fGetTextureParameterfv;
- GrGLFunction<GrGLGetTextureParameterivProc> fGetTextureParameteriv;
- GrGLFunction<GrGLGetTextureLevelParameterfvProc> fGetTextureLevelParameterfv;
- GrGLFunction<GrGLGetTextureLevelParameterivProc> fGetTextureLevelParameteriv;
- // OpenGL 1.2
- GrGLFunction<GrGLTextureImage3DProc> fTextureImage3D;
- GrGLFunction<GrGLTextureSubImage3DProc> fTextureSubImage3D;
- GrGLFunction<GrGLCopyTextureSubImage3DProc> fCopyTextureSubImage3D;
- GrGLFunction<GrGLCompressedTextureImage3DProc> fCompressedTextureImage3D;
- GrGLFunction<GrGLCompressedTextureImage2DProc> fCompressedTextureImage2D;
- GrGLFunction<GrGLCompressedTextureImage1DProc> fCompressedTextureImage1D;
- GrGLFunction<GrGLCompressedTextureSubImage3DProc> fCompressedTextureSubImage3D;
- GrGLFunction<GrGLCompressedTextureSubImage2DProc> fCompressedTextureSubImage2D;
- GrGLFunction<GrGLCompressedTextureSubImage1DProc> fCompressedTextureSubImage1D;
- GrGLFunction<GrGLGetCompressedTextureImageProc> fGetCompressedTextureImage;
- // OpenGL 1.5
- GrGLFunction<GrGLNamedBufferDataProc> fNamedBufferData;
- GrGLFunction<GrGLNamedBufferSubDataProc> fNamedBufferSubData;
- GrGLFunction<GrGLMapNamedBufferProc> fMapNamedBuffer;
- GrGLFunction<GrGLUnmapNamedBufferProc> fUnmapNamedBuffer;
- GrGLFunction<GrGLGetNamedBufferParameterivProc> fGetNamedBufferParameteriv;
- GrGLFunction<GrGLGetNamedBufferPointervProc> fGetNamedBufferPointerv;
- GrGLFunction<GrGLGetNamedBufferSubDataProc> fGetNamedBufferSubData;
- // OpenGL 2.0
- GrGLFunction<GrGLProgramUniform1fProc> fProgramUniform1f;
- GrGLFunction<GrGLProgramUniform2fProc> fProgramUniform2f;
- GrGLFunction<GrGLProgramUniform3fProc> fProgramUniform3f;
- GrGLFunction<GrGLProgramUniform4fProc> fProgramUniform4f;
- GrGLFunction<GrGLProgramUniform1iProc> fProgramUniform1i;
- GrGLFunction<GrGLProgramUniform2iProc> fProgramUniform2i;
- GrGLFunction<GrGLProgramUniform3iProc> fProgramUniform3i;
- GrGLFunction<GrGLProgramUniform4iProc> fProgramUniform4i;
- GrGLFunction<GrGLProgramUniform1fvProc> fProgramUniform1fv;
- GrGLFunction<GrGLProgramUniform2fvProc> fProgramUniform2fv;
- GrGLFunction<GrGLProgramUniform3fvProc> fProgramUniform3fv;
- GrGLFunction<GrGLProgramUniform4fvProc> fProgramUniform4fv;
- GrGLFunction<GrGLProgramUniform1ivProc> fProgramUniform1iv;
- GrGLFunction<GrGLProgramUniform2ivProc> fProgramUniform2iv;
- GrGLFunction<GrGLProgramUniform3ivProc> fProgramUniform3iv;
- GrGLFunction<GrGLProgramUniform4ivProc> fProgramUniform4iv;
- GrGLFunction<GrGLProgramUniformMatrix2fvProc> fProgramUniformMatrix2fv;
- GrGLFunction<GrGLProgramUniformMatrix3fvProc> fProgramUniformMatrix3fv;
- GrGLFunction<GrGLProgramUniformMatrix4fvProc> fProgramUniformMatrix4fv;
- // OpenGL 2.1
- GrGLFunction<GrGLProgramUniformMatrix2x3fvProc> fProgramUniformMatrix2x3fv;
- GrGLFunction<GrGLProgramUniformMatrix3x2fvProc> fProgramUniformMatrix3x2fv;
- GrGLFunction<GrGLProgramUniformMatrix2x4fvProc> fProgramUniformMatrix2x4fv;
- GrGLFunction<GrGLProgramUniformMatrix4x2fvProc> fProgramUniformMatrix4x2fv;
- GrGLFunction<GrGLProgramUniformMatrix3x4fvProc> fProgramUniformMatrix3x4fv;
- GrGLFunction<GrGLProgramUniformMatrix4x3fvProc> fProgramUniformMatrix4x3fv;
- // OpenGL 3.0
- GrGLFunction<GrGLNamedRenderbufferStorageProc> fNamedRenderbufferStorage;
- GrGLFunction<GrGLGetNamedRenderbufferParameterivProc> fGetNamedRenderbufferParameteriv;
- GrGLFunction<GrGLNamedRenderbufferStorageMultisampleProc> fNamedRenderbufferStorageMultisample;
- GrGLFunction<GrGLCheckNamedFramebufferStatusProc> fCheckNamedFramebufferStatus;
- GrGLFunction<GrGLNamedFramebufferTexture1DProc> fNamedFramebufferTexture1D;
- GrGLFunction<GrGLNamedFramebufferTexture2DProc> fNamedFramebufferTexture2D;
- GrGLFunction<GrGLNamedFramebufferTexture3DProc> fNamedFramebufferTexture3D;
- GrGLFunction<GrGLNamedFramebufferRenderbufferProc> fNamedFramebufferRenderbuffer;
- GrGLFunction<GrGLGetNamedFramebufferAttachmentParameterivProc> fGetNamedFramebufferAttachmentParameteriv;
- GrGLFunction<GrGLGenerateTextureMipmapProc> fGenerateTextureMipmap;
- GrGLFunction<GrGLFramebufferDrawBufferProc> fFramebufferDrawBuffer;
- GrGLFunction<GrGLFramebufferDrawBuffersProc> fFramebufferDrawBuffers;
- GrGLFunction<GrGLFramebufferReadBufferProc> fFramebufferReadBuffer;
- GrGLFunction<GrGLGetFramebufferParameterivProc> fGetFramebufferParameteriv;
- GrGLFunction<GrGLNamedCopyBufferSubDataProc> fNamedCopyBufferSubData;
- GrGLFunction<GrGLVertexArrayVertexOffsetProc> fVertexArrayVertexOffset;
- GrGLFunction<GrGLVertexArrayColorOffsetProc> fVertexArrayColorOffset;
- GrGLFunction<GrGLVertexArrayEdgeFlagOffsetProc> fVertexArrayEdgeFlagOffset;
- GrGLFunction<GrGLVertexArrayIndexOffsetProc> fVertexArrayIndexOffset;
- GrGLFunction<GrGLVertexArrayNormalOffsetProc> fVertexArrayNormalOffset;
- GrGLFunction<GrGLVertexArrayTexCoordOffsetProc> fVertexArrayTexCoordOffset;
- GrGLFunction<GrGLVertexArrayMultiTexCoordOffsetProc> fVertexArrayMultiTexCoordOffset;
- GrGLFunction<GrGLVertexArrayFogCoordOffsetProc> fVertexArrayFogCoordOffset;
- GrGLFunction<GrGLVertexArraySecondaryColorOffsetProc> fVertexArraySecondaryColorOffset;
- GrGLFunction<GrGLVertexArrayVertexAttribOffsetProc> fVertexArrayVertexAttribOffset;
- GrGLFunction<GrGLVertexArrayVertexAttribIOffsetProc> fVertexArrayVertexAttribIOffset;
- GrGLFunction<GrGLEnableVertexArrayProc> fEnableVertexArray;
- GrGLFunction<GrGLDisableVertexArrayProc> fDisableVertexArray;
- GrGLFunction<GrGLEnableVertexArrayAttribProc> fEnableVertexArrayAttrib;
- GrGLFunction<GrGLDisableVertexArrayAttribProc> fDisableVertexArrayAttrib;
- GrGLFunction<GrGLGetVertexArrayIntegervProc> fGetVertexArrayIntegerv;
- GrGLFunction<GrGLGetVertexArrayPointervProc> fGetVertexArrayPointerv;
- GrGLFunction<GrGLGetVertexArrayIntegeri_vProc> fGetVertexArrayIntegeri_v;
- GrGLFunction<GrGLGetVertexArrayPointeri_vProc> fGetVertexArrayPointeri_v;
- GrGLFunction<GrGLMapNamedBufferRangeProc> fMapNamedBufferRange;
- GrGLFunction<GrGLFlushMappedNamedBufferRangeProc> fFlushMappedNamedBufferRange;
- // OpenGL 3.1
- GrGLFunction<GrGLTextureBufferProc> fTextureBuffer;
-
/* ARB_sync */
GrGLFunction<GrGLFenceSyncProc> fFenceSync;
GrGLFunction<GrGLIsSyncProc> fIsSync;
diff --git a/src/gpu/gl/GrGLAssembleInterface.cpp b/src/gpu/gl/GrGLAssembleInterface.cpp
index fcb9deb..9fc5653 100644
--- a/src/gpu/gl/GrGLAssembleInterface.cpp
+++ b/src/gpu/gl/GrGLAssembleInterface.cpp
@@ -382,113 +382,6 @@
GET_PROC_SUFFIX(ProgramUniformHandleui64v, NV);
}
- if (extensions.has("GL_EXT_direct_state_access")) {
- GET_PROC_SUFFIX(TextureParameteri, EXT);
- GET_PROC_SUFFIX(TextureParameteriv, EXT);
- GET_PROC_SUFFIX(TextureParameterf, EXT);
- GET_PROC_SUFFIX(TextureParameterfv, EXT);
- GET_PROC_SUFFIX(TextureImage1D, EXT);
- GET_PROC_SUFFIX(TextureImage2D, EXT);
- GET_PROC_SUFFIX(TextureSubImage1D, EXT);
- GET_PROC_SUFFIX(TextureSubImage2D, EXT);
- GET_PROC_SUFFIX(CopyTextureImage1D, EXT);
- GET_PROC_SUFFIX(CopyTextureImage2D, EXT);
- GET_PROC_SUFFIX(CopyTextureSubImage1D, EXT);
- GET_PROC_SUFFIX(CopyTextureSubImage2D, EXT);
- GET_PROC_SUFFIX(GetNamedBufferParameteriv, EXT);
- GET_PROC_SUFFIX(GetNamedBufferPointerv, EXT);
- GET_PROC_SUFFIX(GetNamedBufferSubData, EXT);
- GET_PROC_SUFFIX(GetTextureImage, EXT);
- GET_PROC_SUFFIX(GetTextureParameterfv, EXT);
- GET_PROC_SUFFIX(GetTextureParameteriv, EXT);
- GET_PROC_SUFFIX(GetTextureLevelParameterfv, EXT);
- GET_PROC_SUFFIX(GetTextureLevelParameteriv, EXT);
- GET_PROC_SUFFIX(MapNamedBuffer, EXT);
- GET_PROC_SUFFIX(NamedBufferData, EXT);
- GET_PROC_SUFFIX(NamedBufferSubData, EXT);
- GET_PROC_SUFFIX(ProgramUniform1f, EXT);
- GET_PROC_SUFFIX(ProgramUniform2f, EXT);
- GET_PROC_SUFFIX(ProgramUniform3f, EXT);
- GET_PROC_SUFFIX(ProgramUniform4f, EXT);
- GET_PROC_SUFFIX(ProgramUniform1i, EXT);
- GET_PROC_SUFFIX(ProgramUniform2i, EXT);
- GET_PROC_SUFFIX(ProgramUniform3i, EXT);
- GET_PROC_SUFFIX(ProgramUniform4i, EXT);
- GET_PROC_SUFFIX(ProgramUniform1fv, EXT);
- GET_PROC_SUFFIX(ProgramUniform2fv, EXT);
- GET_PROC_SUFFIX(ProgramUniform3fv, EXT);
- GET_PROC_SUFFIX(ProgramUniform4fv, EXT);
- GET_PROC_SUFFIX(ProgramUniform1iv, EXT);
- GET_PROC_SUFFIX(ProgramUniform2iv, EXT);
- GET_PROC_SUFFIX(ProgramUniform3iv, EXT);
- GET_PROC_SUFFIX(ProgramUniform4iv, EXT);
- GET_PROC_SUFFIX(ProgramUniformMatrix2fv, EXT);
- GET_PROC_SUFFIX(ProgramUniformMatrix3fv, EXT);
- GET_PROC_SUFFIX(ProgramUniformMatrix4fv, EXT);
- GET_PROC_SUFFIX(UnmapNamedBuffer, EXT);
- if (glVer >= GR_GL_VER(1,2)) {
- GET_PROC_SUFFIX(TextureImage3D, EXT);
- GET_PROC_SUFFIX(TextureSubImage3D, EXT);
- GET_PROC_SUFFIX(CopyTextureSubImage3D, EXT);
- GET_PROC_SUFFIX(CompressedTextureImage3D, EXT);
- GET_PROC_SUFFIX(CompressedTextureImage2D, EXT);
- GET_PROC_SUFFIX(CompressedTextureImage1D, EXT);
- GET_PROC_SUFFIX(CompressedTextureSubImage3D, EXT);
- GET_PROC_SUFFIX(CompressedTextureSubImage2D, EXT);
- GET_PROC_SUFFIX(CompressedTextureSubImage1D, EXT);
- GET_PROC_SUFFIX(GetCompressedTextureImage, EXT);
- }
- if (glVer >= GR_GL_VER(2,1)) {
- GET_PROC_SUFFIX(ProgramUniformMatrix2x3fv, EXT);
- GET_PROC_SUFFIX(ProgramUniformMatrix3x2fv, EXT);
- GET_PROC_SUFFIX(ProgramUniformMatrix2x4fv, EXT);
- GET_PROC_SUFFIX(ProgramUniformMatrix4x2fv, EXT);
- GET_PROC_SUFFIX(ProgramUniformMatrix3x4fv, EXT);
- GET_PROC_SUFFIX(ProgramUniformMatrix4x3fv, EXT);
- }
- if (glVer >= GR_GL_VER(3,0)) {
- GET_PROC_SUFFIX(NamedRenderbufferStorage, EXT);
- GET_PROC_SUFFIX(GetNamedRenderbufferParameteriv, EXT);
- GET_PROC_SUFFIX(NamedRenderbufferStorageMultisample, EXT);
- GET_PROC_SUFFIX(CheckNamedFramebufferStatus, EXT);
- GET_PROC_SUFFIX(NamedFramebufferTexture1D, EXT);
- GET_PROC_SUFFIX(NamedFramebufferTexture2D, EXT);
- GET_PROC_SUFFIX(NamedFramebufferTexture3D, EXT);
- GET_PROC_SUFFIX(NamedFramebufferRenderbuffer, EXT);
- GET_PROC_SUFFIX(GetNamedFramebufferAttachmentParameteriv, EXT);
- GET_PROC_SUFFIX(GenerateTextureMipmap, EXT);
- GET_PROC_SUFFIX(FramebufferDrawBuffer, EXT);
- GET_PROC_SUFFIX(FramebufferDrawBuffers, EXT);
- GET_PROC_SUFFIX(FramebufferReadBuffer, EXT);
- GET_PROC_SUFFIX(GetFramebufferParameteriv, EXT);
- GET_PROC_SUFFIX(NamedCopyBufferSubData, EXT);
- GET_PROC_SUFFIX(VertexArrayVertexOffset, EXT);
- GET_PROC_SUFFIX(VertexArrayColorOffset, EXT);
- GET_PROC_SUFFIX(VertexArrayEdgeFlagOffset, EXT);
- GET_PROC_SUFFIX(VertexArrayIndexOffset, EXT);
- GET_PROC_SUFFIX(VertexArrayNormalOffset, EXT);
- GET_PROC_SUFFIX(VertexArrayTexCoordOffset, EXT);
- GET_PROC_SUFFIX(VertexArrayMultiTexCoordOffset, EXT);
- GET_PROC_SUFFIX(VertexArrayFogCoordOffset, EXT);
- GET_PROC_SUFFIX(VertexArraySecondaryColorOffset, EXT);
- GET_PROC_SUFFIX(VertexArrayVertexAttribOffset, EXT);
- GET_PROC_SUFFIX(VertexArrayVertexAttribIOffset, EXT);
- GET_PROC_SUFFIX(EnableVertexArray, EXT);
- GET_PROC_SUFFIX(DisableVertexArray, EXT);
- GET_PROC_SUFFIX(EnableVertexArrayAttrib, EXT);
- GET_PROC_SUFFIX(DisableVertexArrayAttrib, EXT);
- GET_PROC_SUFFIX(GetVertexArrayIntegerv, EXT);
- GET_PROC_SUFFIX(GetVertexArrayPointerv, EXT);
- GET_PROC_SUFFIX(GetVertexArrayIntegeri_v, EXT);
- GET_PROC_SUFFIX(GetVertexArrayPointeri_v, EXT);
- GET_PROC_SUFFIX(MapNamedBufferRange, EXT);
- GET_PROC_SUFFIX(FlushMappedNamedBufferRange, EXT);
- }
- if (glVer >= GR_GL_VER(3,1)) {
- GET_PROC_SUFFIX(TextureBuffer, EXT);
- }
- }
-
if (glVer >= GR_GL_VER(4,3) || extensions.has("GL_KHR_debug")) {
// KHR_debug defines these methods to have no suffix in an OpenGL (not ES) context.
GET_PROC(DebugMessageControl);
diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp
index 7fccb46..f8d1e50 100644
--- a/src/gpu/gl/GrGLCaps.cpp
+++ b/src/gpu/gl/GrGLCaps.cpp
@@ -35,7 +35,6 @@
fAlpha8IsRenderable = false;
fImagingSupport = false;
fVertexArrayObjectSupport = false;
- fDirectStateAccessSupport = false;
fDebugSupport = false;
fES2CompatibilitySupport = false;
fDrawIndirectSupport = false;
@@ -163,12 +162,6 @@
ctxInfo.hasExtension("GL_OES_vertex_array_object");
}
- if (kGL_GrGLStandard == standard) {
- fDirectStateAccessSupport = ctxInfo.hasExtension("GL_EXT_direct_state_access");
- } else {
- fDirectStateAccessSupport = false;
- }
-
if (kGL_GrGLStandard == standard && version >= GR_GL_VER(4,3)) {
fDebugSupport = true;
} else {
@@ -1166,7 +1159,6 @@
writer->appendBool("Alpha8 is renderable", fAlpha8IsRenderable);
writer->appendBool("GL_ARB_imaging support", fImagingSupport);
writer->appendBool("Vertex array object support", fVertexArrayObjectSupport);
- writer->appendBool("Direct state access support", fDirectStateAccessSupport);
writer->appendBool("Debug support", fDebugSupport);
writer->appendBool("Draw indirect support", fDrawIndirectSupport);
writer->appendBool("Multi draw indirect support", fMultiDrawIndirectSupport);
diff --git a/src/gpu/gl/GrGLCaps.h b/src/gpu/gl/GrGLCaps.h
index 7a443e4..c7812be 100644
--- a/src/gpu/gl/GrGLCaps.h
+++ b/src/gpu/gl/GrGLCaps.h
@@ -290,9 +290,6 @@
/// Is there support for Vertex Array Objects?
bool vertexArrayObjectSupport() const { return fVertexArrayObjectSupport; }
- /// Is there support for GL_EXT_direct_state_access?
- bool directStateAccessSupport() const { return fDirectStateAccessSupport; }
-
/// Is there support for GL_KHR_debug?
bool debugSupport() const { return fDebugSupport; }
@@ -458,7 +455,6 @@
bool fAlpha8IsRenderable: 1;
bool fImagingSupport : 1;
bool fVertexArrayObjectSupport : 1;
- bool fDirectStateAccessSupport : 1;
bool fDebugSupport : 1;
bool fES2CompatibilitySupport : 1;
bool fDrawInstancedSupport : 1;
diff --git a/src/gpu/gl/GrGLInterface.cpp b/src/gpu/gl/GrGLInterface.cpp
index 2e7924d..0b94a22 100644
--- a/src/gpu/gl/GrGLInterface.cpp
+++ b/src/gpu/gl/GrGLInterface.cpp
@@ -580,123 +580,6 @@
}
}
- if (kGL_GrGLStandard == fStandard && fExtensions.has("GL_EXT_direct_state_access")) {
- if (!fFunctions.fTextureParameteri ||
- !fFunctions.fTextureParameteriv ||
- !fFunctions.fTextureParameterf ||
- !fFunctions.fTextureParameterfv ||
- !fFunctions.fTextureImage1D ||
- !fFunctions.fTextureImage2D ||
- !fFunctions.fTextureSubImage1D ||
- !fFunctions.fTextureSubImage2D ||
- !fFunctions.fCopyTextureImage1D ||
- !fFunctions.fCopyTextureImage2D ||
- !fFunctions.fCopyTextureSubImage1D ||
- !fFunctions.fCopyTextureSubImage2D ||
- !fFunctions.fGetNamedBufferParameteriv ||
- !fFunctions.fGetNamedBufferPointerv ||
- !fFunctions.fGetNamedBufferSubData ||
- !fFunctions.fGetTextureImage ||
- !fFunctions.fGetTextureParameterfv ||
- !fFunctions.fGetTextureParameteriv ||
- !fFunctions.fGetTextureLevelParameterfv ||
- !fFunctions.fGetTextureLevelParameteriv ||
- !fFunctions.fMapNamedBuffer ||
- !fFunctions.fNamedBufferData ||
- !fFunctions.fNamedBufferSubData ||
- !fFunctions.fProgramUniform1f ||
- !fFunctions.fProgramUniform2f ||
- !fFunctions.fProgramUniform3f ||
- !fFunctions.fProgramUniform4f ||
- !fFunctions.fProgramUniform1i ||
- !fFunctions.fProgramUniform2i ||
- !fFunctions.fProgramUniform3i ||
- !fFunctions.fProgramUniform4i ||
- !fFunctions.fProgramUniform1fv ||
- !fFunctions.fProgramUniform2fv ||
- !fFunctions.fProgramUniform3fv ||
- !fFunctions.fProgramUniform4fv ||
- !fFunctions.fProgramUniform1iv ||
- !fFunctions.fProgramUniform2iv ||
- !fFunctions.fProgramUniform3iv ||
- !fFunctions.fProgramUniform4iv ||
- !fFunctions.fProgramUniformMatrix2fv ||
- !fFunctions.fProgramUniformMatrix3fv ||
- !fFunctions.fProgramUniformMatrix4fv ||
- !fFunctions.fUnmapNamedBuffer) {
- RETURN_FALSE_INTERFACE
- }
- if (glVer >= GR_GL_VER(1,2)) {
- if (!fFunctions.fTextureImage3D ||
- !fFunctions.fTextureSubImage3D ||
- !fFunctions.fCopyTextureSubImage3D ||
- !fFunctions.fCompressedTextureImage3D ||
- !fFunctions.fCompressedTextureImage2D ||
- !fFunctions.fCompressedTextureImage1D ||
- !fFunctions.fCompressedTextureSubImage3D ||
- !fFunctions.fCompressedTextureSubImage2D ||
- !fFunctions.fCompressedTextureSubImage1D ||
- !fFunctions.fGetCompressedTextureImage) {
- RETURN_FALSE_INTERFACE
- }
- }
- if (glVer >= GR_GL_VER(2,1)) {
- if (!fFunctions.fProgramUniformMatrix2x3fv ||
- !fFunctions.fProgramUniformMatrix3x2fv ||
- !fFunctions.fProgramUniformMatrix2x4fv ||
- !fFunctions.fProgramUniformMatrix4x2fv ||
- !fFunctions.fProgramUniformMatrix3x4fv ||
- !fFunctions.fProgramUniformMatrix4x3fv) {
- RETURN_FALSE_INTERFACE
- }
- }
- if (glVer >= GR_GL_VER(3,0)) {
- if (!fFunctions.fNamedRenderbufferStorage ||
- !fFunctions.fGetNamedRenderbufferParameteriv ||
- !fFunctions.fNamedRenderbufferStorageMultisample ||
- !fFunctions.fCheckNamedFramebufferStatus ||
- !fFunctions.fNamedFramebufferTexture1D ||
- !fFunctions.fNamedFramebufferTexture2D ||
- !fFunctions.fNamedFramebufferTexture3D ||
- !fFunctions.fNamedFramebufferRenderbuffer ||
- !fFunctions.fGetNamedFramebufferAttachmentParameteriv ||
- !fFunctions.fGenerateTextureMipmap ||
- !fFunctions.fFramebufferDrawBuffer ||
- !fFunctions.fFramebufferDrawBuffers ||
- !fFunctions.fFramebufferReadBuffer ||
- !fFunctions.fGetFramebufferParameteriv ||
- !fFunctions.fNamedCopyBufferSubData ||
- !fFunctions.fVertexArrayVertexOffset ||
- !fFunctions.fVertexArrayColorOffset ||
- !fFunctions.fVertexArrayEdgeFlagOffset ||
- !fFunctions.fVertexArrayIndexOffset ||
- !fFunctions.fVertexArrayNormalOffset ||
- !fFunctions.fVertexArrayTexCoordOffset ||
- !fFunctions.fVertexArrayMultiTexCoordOffset ||
- !fFunctions.fVertexArrayFogCoordOffset ||
- !fFunctions.fVertexArraySecondaryColorOffset ||
- !fFunctions.fVertexArrayVertexAttribOffset ||
- !fFunctions.fVertexArrayVertexAttribIOffset ||
- !fFunctions.fEnableVertexArray ||
- !fFunctions.fDisableVertexArray ||
- !fFunctions.fEnableVertexArrayAttrib ||
- !fFunctions.fDisableVertexArrayAttrib ||
- !fFunctions.fGetVertexArrayIntegerv ||
- !fFunctions.fGetVertexArrayPointerv ||
- !fFunctions.fGetVertexArrayIntegeri_v ||
- !fFunctions.fGetVertexArrayPointeri_v ||
- !fFunctions.fMapNamedBufferRange ||
- !fFunctions.fFlushMappedNamedBufferRange) {
- RETURN_FALSE_INTERFACE
- }
- }
- if (glVer >= GR_GL_VER(3,1)) {
- if (!fFunctions.fTextureBuffer) {
- RETURN_FALSE_INTERFACE;
- }
- }
- }
-
if ((kGL_GrGLStandard == fStandard && glVer >= GR_GL_VER(4,3)) ||
fExtensions.has("GL_KHR_debug")) {
if (!fFunctions.fDebugMessageControl ||
diff --git a/src/gpu/gl/GrGLTestInterface.cpp b/src/gpu/gl/GrGLTestInterface.cpp
index bceb947..6e73ffd 100644
--- a/src/gpu/gl/GrGLTestInterface.cpp
+++ b/src/gpu/gl/GrGLTestInterface.cpp
@@ -217,102 +217,6 @@
fFunctions.fUniformHandleui64v = bind_to_member(this, &GrGLTestInterface::uniformHandleui64v);
fFunctions.fProgramUniformHandleui64 = bind_to_member(this, &GrGLTestInterface::programUniformHandleui64);
fFunctions.fProgramUniformHandleui64v = bind_to_member(this, &GrGLTestInterface::programUniformHandleui64v);
- fFunctions.fTextureParameteri = bind_to_member(this, &GrGLTestInterface::textureParameteri);
- fFunctions.fTextureParameteriv = bind_to_member(this, &GrGLTestInterface::textureParameteriv);
- fFunctions.fTextureParameterf = bind_to_member(this, &GrGLTestInterface::textureParameterf);
- fFunctions.fTextureParameterfv = bind_to_member(this, &GrGLTestInterface::textureParameterfv);
- fFunctions.fTextureImage1D = bind_to_member(this, &GrGLTestInterface::textureImage1D);
- fFunctions.fTextureImage2D = bind_to_member(this, &GrGLTestInterface::textureImage2D);
- fFunctions.fTextureSubImage1D = bind_to_member(this, &GrGLTestInterface::textureSubImage1D);
- fFunctions.fTextureSubImage2D = bind_to_member(this, &GrGLTestInterface::textureSubImage2D);
- fFunctions.fCopyTextureImage1D = bind_to_member(this, &GrGLTestInterface::copyTextureImage1D);
- fFunctions.fCopyTextureImage2D = bind_to_member(this, &GrGLTestInterface::copyTextureImage2D);
- fFunctions.fCopyTextureSubImage1D = bind_to_member(this, &GrGLTestInterface::copyTextureSubImage1D);
- fFunctions.fCopyTextureSubImage2D = bind_to_member(this, &GrGLTestInterface::copyTextureSubImage2D);
- fFunctions.fGetTextureImage = bind_to_member(this, &GrGLTestInterface::getTextureImage);
- fFunctions.fGetTextureParameterfv = bind_to_member(this, &GrGLTestInterface::getTextureParameterfv);
- fFunctions.fGetTextureParameteriv = bind_to_member(this, &GrGLTestInterface::getTextureParameteriv);
- fFunctions.fGetTextureLevelParameterfv = bind_to_member(this, &GrGLTestInterface::getTextureLevelParameterfv);
- fFunctions.fGetTextureLevelParameteriv = bind_to_member(this, &GrGLTestInterface::getTextureLevelParameteriv);
- fFunctions.fTextureImage3D = bind_to_member(this, &GrGLTestInterface::textureImage3D);
- fFunctions.fTextureSubImage3D = bind_to_member(this, &GrGLTestInterface::textureSubImage3D);
- fFunctions.fCopyTextureSubImage3D = bind_to_member(this, &GrGLTestInterface::copyTextureSubImage3D);
- fFunctions.fCompressedTextureImage3D = bind_to_member(this, &GrGLTestInterface::compressedTextureImage3D);
- fFunctions.fCompressedTextureImage2D = bind_to_member(this, &GrGLTestInterface::compressedTextureImage2D);
- fFunctions.fCompressedTextureImage1D = bind_to_member(this, &GrGLTestInterface::compressedTextureImage1D);
- fFunctions.fCompressedTextureSubImage3D = bind_to_member(this, &GrGLTestInterface::compressedTextureSubImage3D);
- fFunctions.fCompressedTextureSubImage2D = bind_to_member(this, &GrGLTestInterface::compressedTextureSubImage2D);
- fFunctions.fCompressedTextureSubImage1D = bind_to_member(this, &GrGLTestInterface::compressedTextureSubImage1D);
- fFunctions.fGetCompressedTextureImage = bind_to_member(this, &GrGLTestInterface::getCompressedTextureImage);
- fFunctions.fNamedBufferData = bind_to_member(this, &GrGLTestInterface::namedBufferData);
- fFunctions.fNamedBufferSubData = bind_to_member(this, &GrGLTestInterface::namedBufferSubData);
- fFunctions.fMapNamedBuffer = bind_to_member(this, &GrGLTestInterface::mapNamedBuffer);
- fFunctions.fUnmapNamedBuffer = bind_to_member(this, &GrGLTestInterface::unmapNamedBuffer);
- fFunctions.fGetNamedBufferParameteriv = bind_to_member(this, &GrGLTestInterface::getNamedBufferParameteriv);
- fFunctions.fGetNamedBufferPointerv = bind_to_member(this, &GrGLTestInterface::getNamedBufferPointerv);
- fFunctions.fGetNamedBufferSubData = bind_to_member(this, &GrGLTestInterface::getNamedBufferSubData);
- fFunctions.fProgramUniform1f = bind_to_member(this, &GrGLTestInterface::programUniform1f);
- fFunctions.fProgramUniform2f = bind_to_member(this, &GrGLTestInterface::programUniform2f);
- fFunctions.fProgramUniform3f = bind_to_member(this, &GrGLTestInterface::programUniform3f);
- fFunctions.fProgramUniform4f = bind_to_member(this, &GrGLTestInterface::programUniform4f);
- fFunctions.fProgramUniform1i = bind_to_member(this, &GrGLTestInterface::programUniform1i);
- fFunctions.fProgramUniform2i = bind_to_member(this, &GrGLTestInterface::programUniform2i);
- fFunctions.fProgramUniform3i = bind_to_member(this, &GrGLTestInterface::programUniform3i);
- fFunctions.fProgramUniform4i = bind_to_member(this, &GrGLTestInterface::programUniform4i);
- fFunctions.fProgramUniform1fv = bind_to_member(this, &GrGLTestInterface::programUniform1fv);
- fFunctions.fProgramUniform2fv = bind_to_member(this, &GrGLTestInterface::programUniform2fv);
- fFunctions.fProgramUniform3fv = bind_to_member(this, &GrGLTestInterface::programUniform3fv);
- fFunctions.fProgramUniform4fv = bind_to_member(this, &GrGLTestInterface::programUniform4fv);
- fFunctions.fProgramUniform1iv = bind_to_member(this, &GrGLTestInterface::programUniform1iv);
- fFunctions.fProgramUniform2iv = bind_to_member(this, &GrGLTestInterface::programUniform2iv);
- fFunctions.fProgramUniform3iv = bind_to_member(this, &GrGLTestInterface::programUniform3iv);
- fFunctions.fProgramUniform4iv = bind_to_member(this, &GrGLTestInterface::programUniform4iv);
- fFunctions.fProgramUniformMatrix2fv = bind_to_member(this, &GrGLTestInterface::programUniformMatrix2fv);
- fFunctions.fProgramUniformMatrix3fv = bind_to_member(this, &GrGLTestInterface::programUniformMatrix3fv);
- fFunctions.fProgramUniformMatrix4fv = bind_to_member(this, &GrGLTestInterface::programUniformMatrix4fv);
- fFunctions.fProgramUniformMatrix2x3fv = bind_to_member(this, &GrGLTestInterface::programUniformMatrix2x3fv);
- fFunctions.fProgramUniformMatrix3x2fv = bind_to_member(this, &GrGLTestInterface::programUniformMatrix3x2fv);
- fFunctions.fProgramUniformMatrix2x4fv = bind_to_member(this, &GrGLTestInterface::programUniformMatrix2x4fv);
- fFunctions.fProgramUniformMatrix4x2fv = bind_to_member(this, &GrGLTestInterface::programUniformMatrix4x2fv);
- fFunctions.fProgramUniformMatrix3x4fv = bind_to_member(this, &GrGLTestInterface::programUniformMatrix3x4fv);
- fFunctions.fProgramUniformMatrix4x3fv = bind_to_member(this, &GrGLTestInterface::programUniformMatrix4x3fv);
- fFunctions.fNamedRenderbufferStorage = bind_to_member(this, &GrGLTestInterface::namedRenderbufferStorage);
- fFunctions.fGetNamedRenderbufferParameteriv = bind_to_member(this, &GrGLTestInterface::getNamedRenderbufferParameteriv);
- fFunctions.fNamedRenderbufferStorageMultisample = bind_to_member(this, &GrGLTestInterface::namedRenderbufferStorageMultisample);
- fFunctions.fCheckNamedFramebufferStatus = bind_to_member(this, &GrGLTestInterface::checkNamedFramebufferStatus);
- fFunctions.fNamedFramebufferTexture1D = bind_to_member(this, &GrGLTestInterface::namedFramebufferTexture1D);
- fFunctions.fNamedFramebufferTexture2D = bind_to_member(this, &GrGLTestInterface::namedFramebufferTexture2D);
- fFunctions.fNamedFramebufferTexture3D = bind_to_member(this, &GrGLTestInterface::namedFramebufferTexture3D);
- fFunctions.fNamedFramebufferRenderbuffer = bind_to_member(this, &GrGLTestInterface::namedFramebufferRenderbuffer);
- fFunctions.fGetNamedFramebufferAttachmentParameteriv = bind_to_member(this, &GrGLTestInterface::getNamedFramebufferAttachmentParameteriv);
- fFunctions.fGenerateTextureMipmap = bind_to_member(this, &GrGLTestInterface::generateTextureMipmap);
- fFunctions.fFramebufferDrawBuffer = bind_to_member(this, &GrGLTestInterface::framebufferDrawBuffer);
- fFunctions.fFramebufferDrawBuffers = bind_to_member(this, &GrGLTestInterface::framebufferDrawBuffers);
- fFunctions.fFramebufferReadBuffer = bind_to_member(this, &GrGLTestInterface::framebufferReadBuffer);
- fFunctions.fGetFramebufferParameteriv = bind_to_member(this, &GrGLTestInterface::getFramebufferParameteriv);
- fFunctions.fNamedCopyBufferSubData = bind_to_member(this, &GrGLTestInterface::namedCopyBufferSubData);
- fFunctions.fVertexArrayVertexOffset = bind_to_member(this, &GrGLTestInterface::vertexArrayVertexOffset);
- fFunctions.fVertexArrayColorOffset = bind_to_member(this, &GrGLTestInterface::vertexArrayColorOffset);
- fFunctions.fVertexArrayEdgeFlagOffset = bind_to_member(this, &GrGLTestInterface::vertexArrayEdgeFlagOffset);
- fFunctions.fVertexArrayIndexOffset = bind_to_member(this, &GrGLTestInterface::vertexArrayIndexOffset);
- fFunctions.fVertexArrayNormalOffset = bind_to_member(this, &GrGLTestInterface::vertexArrayNormalOffset);
- fFunctions.fVertexArrayTexCoordOffset = bind_to_member(this, &GrGLTestInterface::vertexArrayTexCoordOffset);
- fFunctions.fVertexArrayMultiTexCoordOffset = bind_to_member(this, &GrGLTestInterface::vertexArrayMultiTexCoordOffset);
- fFunctions.fVertexArrayFogCoordOffset = bind_to_member(this, &GrGLTestInterface::vertexArrayFogCoordOffset);
- fFunctions.fVertexArraySecondaryColorOffset = bind_to_member(this, &GrGLTestInterface::vertexArraySecondaryColorOffset);
- fFunctions.fVertexArrayVertexAttribOffset = bind_to_member(this, &GrGLTestInterface::vertexArrayVertexAttribOffset);
- fFunctions.fVertexArrayVertexAttribIOffset = bind_to_member(this, &GrGLTestInterface::vertexArrayVertexAttribIOffset);
- fFunctions.fEnableVertexArray = bind_to_member(this, &GrGLTestInterface::enableVertexArray);
- fFunctions.fDisableVertexArray = bind_to_member(this, &GrGLTestInterface::disableVertexArray);
- fFunctions.fEnableVertexArrayAttrib = bind_to_member(this, &GrGLTestInterface::enableVertexArrayAttrib);
- fFunctions.fDisableVertexArrayAttrib = bind_to_member(this, &GrGLTestInterface::disableVertexArrayAttrib);
- fFunctions.fGetVertexArrayIntegerv = bind_to_member(this, &GrGLTestInterface::getVertexArrayIntegerv);
- fFunctions.fGetVertexArrayPointerv = bind_to_member(this, &GrGLTestInterface::getVertexArrayPointerv);
- fFunctions.fGetVertexArrayIntegeri_v = bind_to_member(this, &GrGLTestInterface::getVertexArrayIntegeri_v);
- fFunctions.fGetVertexArrayPointeri_v = bind_to_member(this, &GrGLTestInterface::getVertexArrayPointeri_v);
- fFunctions.fMapNamedBufferRange = bind_to_member(this, &GrGLTestInterface::mapNamedBufferRange);
- fFunctions.fFlushMappedNamedBufferRange = bind_to_member(this, &GrGLTestInterface::flushMappedNamedBufferRange);
- fFunctions.fTextureBuffer = bind_to_member(this, &GrGLTestInterface::textureBuffer);
fFunctions.fFenceSync = bind_to_member(this, &GrGLTestInterface::fenceSync);
fFunctions.fIsSync = bind_to_member(this, &GrGLTestInterface::isSync);
fFunctions.fClientWaitSync = bind_to_member(this, &GrGLTestInterface::clientWaitSync);