| Index: third_party/WebKit/public/platform/WebGraphicsContext3D.h
|
| diff --git a/third_party/WebKit/public/platform/WebGraphicsContext3D.h b/third_party/WebKit/public/platform/WebGraphicsContext3D.h
|
| index fe41c7778199e0b98bee952b198ee04dfe158ef2..45e507eef0d9c539085ff6fe2075eaae6b145597 100644
|
| --- a/third_party/WebKit/public/platform/WebGraphicsContext3D.h
|
| +++ b/third_party/WebKit/public/platform/WebGraphicsContext3D.h
|
| @@ -64,7 +64,6 @@ typedef signed long int WGC3Dintptr;
|
| typedef signed long int WGC3Dsizeiptr;
|
| typedef int64_t WGC3Dint64;
|
| typedef uint64_t WGC3Duint64;
|
| -typedef struct __WGC3Dsync *WGC3Dsync;
|
|
|
| // Typedef for server-side objects like OpenGL textures and program objects.
|
| typedef WGC3Duint WebGLId;
|
| @@ -150,14 +149,9 @@ public:
|
| // GL_CHROMIUM_request_extension
|
| virtual WebString getRequestableExtensionsCHROMIUM() = 0;
|
|
|
| - // GL_CHROMIUM_framebuffer_multisample
|
| - virtual void blitFramebufferCHROMIUM(WGC3Dint srcX0, WGC3Dint srcY0, WGC3Dint srcX1, WGC3Dint srcY1, WGC3Dint dstX0, WGC3Dint dstY0, WGC3Dint dstX1, WGC3Dint dstY1, WGC3Dbitfield mask, WGC3Denum filter) = 0;
|
| -
|
| // The entry points below map directly to the OpenGL ES 2.0 API.
|
| // See: http://www.khronos.org/registry/gles/
|
| // and: http://www.khronos.org/opengles/sdk/docs/man/
|
| - virtual void drawElements(WGC3Denum mode, WGC3Dsizei count, WGC3Denum type, WGC3Dintptr offset) = 0;
|
| -
|
| virtual bool getActiveAttrib(WebGLId program, WGC3Duint index, ActiveInfo&) = 0;
|
| virtual bool getActiveUniform(WebGLId program, WGC3Duint index, ActiveInfo&) = 0;
|
| virtual WGC3Denum getError() = 0;
|
| @@ -165,13 +159,9 @@ public:
|
| virtual WebString getShaderInfoLog(WebGLId shader) = 0;
|
| virtual WebString getShaderSource(WebGLId shader) = 0;
|
| virtual WebString getString(WGC3Denum name) = 0;
|
| - virtual WGC3Dintptr getVertexAttribOffset(WGC3Duint index, WGC3Denum pname) = 0;
|
|
|
| virtual void shaderSource(WebGLId shader, const WGC3Dchar* string) = 0;
|
|
|
| - virtual void vertexAttribPointer(WGC3Duint index, WGC3Dint size, WGC3Denum type, WGC3Dboolean normalized,
|
| - WGC3Dsizei stride, WGC3Dintptr offset) = 0;
|
| -
|
| virtual WebGLId createBuffer() = 0;
|
| virtual WebGLId createFramebuffer() = 0;
|
| virtual WebGLId createRenderbuffer() = 0;
|
| @@ -212,7 +202,6 @@ public:
|
| virtual void clearBufferfv(WGC3Denum buffer, WGC3Dint drawbuffer, const WGC3Dfloat *value) { }
|
| virtual void clearBufferiv(WGC3Denum buffer, WGC3Dint drawbuffer, const WGC3Dint *value) { }
|
| virtual void clearBufferuiv(WGC3Denum buffer, WGC3Dint drawbuffer, const WGC3Duint *value) { }
|
| - virtual WGC3Denum clientWaitSync(WGC3Dsync sync, WGC3Dbitfield flags, WGC3Duint64 timeout) { return 0x911D; /* GL_WAIT_FAILED */ }
|
| virtual void compressedTexImage3D(WGC3Denum target, WGC3Dint level, WGC3Denum internalformat, WGC3Dsizei width, WGC3Dsizei height, WGC3Dsizei depth, WGC3Dint border, WGC3Dsizei imageSize, const void *data) { }
|
| virtual void compressedTexSubImage3D(WGC3Denum target, WGC3Dint level, WGC3Dint xoffset, WGC3Dint yoffset, WGC3Dint zoffset, WGC3Dsizei width, WGC3Dsizei height, WGC3Dsizei depth, WGC3Denum format, WGC3Dsizei imageSize, const void *data) { }
|
| virtual void copyBufferSubData(WGC3Denum readTarget, WGC3Denum writeTarget, WGC3Dintptr readOffset, WGC3Dintptr writeOffset, WGC3Dsizeiptr size) { }
|
| @@ -220,11 +209,8 @@ public:
|
| virtual WebGLId createSampler() { return 0; }
|
| virtual WebGLId createTransformFeedback() { return 0; }
|
| virtual void deleteSampler(WebGLId sampler) { }
|
| - virtual void deleteSync(WGC3Dsync sync) { }
|
| virtual void deleteTransformFeedback(WebGLId transformfeedback) { }
|
| - virtual void drawRangeElements(WGC3Denum mode, WGC3Duint start, WGC3Duint end, WGC3Dsizei count, WGC3Denum type, WGC3Dintptr offset) { }
|
| virtual void endTransformFeedback(void) { }
|
| - virtual WGC3Dsync fenceSync(WGC3Denum condition, WGC3Dbitfield flags) { return nullptr; }
|
| virtual void getActiveUniformBlockName(WebGLId program, WGC3Duint uniformBlockIndex, WGC3Dsizei bufSize, WGC3Dsizei *length, WGC3Dchar *uniformBlockName) { }
|
| virtual void getActiveUniformBlockiv(WebGLId program, WGC3Duint uniformBlockIndex, WGC3Denum pname, WGC3Dint *params) { }
|
| virtual void getActiveUniformsiv(WebGLId program, WGC3Dsizei uniformCount, const WGC3Duint *uniformIndices, WGC3Denum pname, WGC3Dint *params) { }
|
| @@ -233,7 +219,6 @@ public:
|
| virtual void getInternalformativ(WGC3Denum target, WGC3Denum internalformat, WGC3Denum pname, WGC3Dsizei bufSize, WGC3Dint *params) { }
|
| virtual void getSamplerParameterfv(WebGLId sampler, WGC3Denum pname, WGC3Dfloat *params) { }
|
| virtual void getSamplerParameteriv(WebGLId sampler, WGC3Denum pname, WGC3Dint *params) { }
|
| - virtual void getSynciv(WGC3Dsync sync, WGC3Denum pname, WGC3Dsizei bufSize, WGC3Dsizei *length, WGC3Dint *params) { }
|
| virtual void getTransformFeedbackVarying(WebGLId program, WGC3Duint index, WGC3Dsizei bufSize, WGC3Dsizei *length, WGC3Dsizei *size, WGC3Denum *type, WGC3Dchar *name) { }
|
| virtual WGC3Duint getUniformBlockIndex(WebGLId program, const WGC3Dchar *uniformBlockName) { return 0xFFFFFFFFu; /* GL_INVALID_INDEX */ }
|
| virtual void getUniformIndices(WebGLId program, WGC3Dsizei uniformCount, const WGC3Dchar *const*uniformNames, WGC3Duint *uniformIndices) { }
|
| @@ -241,7 +226,6 @@ public:
|
| virtual void invalidateFramebuffer(WGC3Denum target, WGC3Dsizei numAttachments, const WGC3Denum *attachments) { }
|
| virtual void invalidateSubFramebuffer(WGC3Denum target, WGC3Dsizei numAttachments, const WGC3Denum *attachments, WGC3Dint x, WGC3Dint y, WGC3Dsizei width, WGC3Dsizei height) { }
|
| virtual WGC3Dboolean isSampler(WebGLId sampler) { return false; }
|
| - virtual WGC3Dboolean isSync(WGC3Dsync sync) { return false; }
|
| virtual WGC3Dboolean isTransformFeedback(WebGLId transformfeedback) { return false; }
|
| virtual void* mapBufferRange(WGC3Denum target, WGC3Dintptr offset, WGC3Dsizeiptr length, WGC3Dbitfield access) { return 0; }
|
| virtual void pauseTransformFeedback(void) { }
|
| @@ -255,9 +239,6 @@ public:
|
| virtual void transformFeedbackVaryings(WebGLId program, WGC3Dsizei count, const WGC3Dchar *const*varyings, WGC3Denum bufferMode) { }
|
| virtual WGC3Dboolean unmapBuffer(WGC3Denum target) { return false; }
|
|
|
| - virtual void vertexAttribIPointer(WGC3Duint index, WGC3Dint size, WGC3Denum type, WGC3Dsizei stride, WGC3Dintptr pointer) { }
|
| - virtual void waitSync(WGC3Dsync sync, WGC3Dbitfield flags, WGC3Duint64 timeout) { }
|
| -
|
| // Prefer getting a GLES2Interface off WebGraphicsContext3DProvider if possible, and avoid using WebGraphicsContext3D at all.
|
| virtual gpu::gles2::GLES2Interface* getGLES2Interface() = 0;
|
| };
|
|
|