[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
zmo at google.com
zmo at google.com
Mon Feb 21 00:05:59 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit 2604a70243db70042d57e159896eb37a61d7b00d
Author: zmo at google.com <zmo at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Jan 28 01:29:16 2011 +0000
2011-01-27 Zhenyao Mo <zmo at google.com>
Reviewed by Kenneth Russell.
Define GC3D types to match GL types and use them in WebGraphicsContext3D
https://bugs.webkit.org/show_bug.cgi?id=51947
* public/WebGraphicsContext3D.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76876 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
index 03782b5..a7f9aac 100644
--- a/Source/WebKit/chromium/ChangeLog
+++ b/Source/WebKit/chromium/ChangeLog
@@ -1,5 +1,14 @@
2011-01-27 Zhenyao Mo <zmo at google.com>
+ Reviewed by Kenneth Russell.
+
+ Define GC3D types to match GL types and use them in WebGraphicsContext3D
+ https://bugs.webkit.org/show_bug.cgi?id=51947
+
+ * public/WebGraphicsContext3D.h:
+
+2011-01-27 Zhenyao Mo <zmo at google.com>
+
Unreviewed, roll webkit chromium rev from 72673 to 72894.
Also, added gmock section in DEPS to pull down gmock.
diff --git a/Source/WebKit/chromium/public/WebGraphicsContext3D.h b/Source/WebKit/chromium/public/WebGraphicsContext3D.h
index 4cff2d5..9558bbb 100644
--- a/Source/WebKit/chromium/public/WebGraphicsContext3D.h
+++ b/Source/WebKit/chromium/public/WebGraphicsContext3D.h
@@ -35,10 +35,30 @@
#include "WebNonCopyable.h"
#include "WebString.h"
+#define USE_WGC3D_TYPES
+
namespace WebKit {
+// WGC3D types match the corresponding GL types as defined in OpenGL ES 2.0
+// header file gl2.h from khronos.org.
+typedef char WGC3Dchar;
+typedef unsigned int WGC3Denum;
+typedef unsigned char WGC3Dboolean;
+typedef unsigned int WGC3Dbitfield;
+typedef signed char WGC3Dbyte;
+typedef unsigned char WGC3Dubyte;
+typedef short WGC3Dshort;
+typedef unsigned short WGC3Dushort;
+typedef int WGC3Dint;
+typedef int WGC3Dsizei;
+typedef unsigned int WGC3Duint;
+typedef float WGC3Dfloat;
+typedef float WGC3Dclampf;
+typedef signed long int WGC3Dintptr;
+typedef signed long int WGC3Dsizeiptr;
+
// Typedef for server-side objects like OpenGL textures and program objects.
-typedef unsigned int WebGLId;
+typedef WGC3Duint WebGLId;
class WebView;
@@ -52,8 +72,8 @@ public:
// Return value from getActiveUniform and getActiveAttrib.
struct ActiveInfo {
WebString name;
- unsigned type;
- int size;
+ WGC3Denum type;
+ WGC3Dint size;
};
// Context creation attributes.
@@ -97,10 +117,6 @@ public:
virtual int width() = 0;
virtual int height() = 0;
- // Helper to return the size in bytes of OpenGL data types
- // like GL_FLOAT, GL_INT, etc.
- virtual int sizeInBytes(int type) = 0;
-
// Resizes the region into which this WebGraphicsContext3D is drawing.
virtual void reshape(int width, int height) = 0;
@@ -116,7 +132,7 @@ public:
// Returns the id of the texture which is used for storing the contents of
// the framebuffer associated with this context. This texture is accessible
// by the gpu-based page compositor.
- virtual unsigned getPlatformTextureId() = 0;
+ virtual WebGLId getPlatformTextureId() = 0;
// Copies the contents of the off-screen render target used by the WebGL
// context to the corresponding texture used by the compositor.
@@ -130,209 +146,191 @@ public:
// Per the behavior of glGetError, this stores at most one
// instance of any given error, and returns them from calls to
// getError in the order they were added.
- virtual void synthesizeGLError(unsigned long error) = 0;
+ virtual void synthesizeGLError(WGC3Denum) = 0;
+
+ virtual bool isContextLost() = 0;
// GL_CHROMIUM_map_sub
- virtual void* mapBufferSubDataCHROMIUM(unsigned target, int offset, int size, unsigned access) = 0;
+ virtual void* mapBufferSubDataCHROMIUM(WGC3Denum target, WGC3Dintptr offset, WGC3Dsizeiptr size, WGC3Denum access) = 0;
virtual void unmapBufferSubDataCHROMIUM(const void*) = 0;
- virtual void* mapTexSubImage2DCHROMIUM(unsigned target, int level, int xoffset, int yoffset, int width, int height, unsigned format, unsigned type, unsigned access) = 0;
+ virtual void* mapTexSubImage2DCHROMIUM(WGC3Denum target, WGC3Dint level, WGC3Dint xoffset, WGC3Dint yoffset, WGC3Dsizei width, WGC3Dsizei height, WGC3Denum format, WGC3Denum type, WGC3Denum access) = 0;
virtual void unmapTexSubImage2DCHROMIUM(const void*) = 0;
// GL_CHROMIUM_copy_texture_to_parent_texture
- virtual void copyTextureToParentTextureCHROMIUM(unsigned texture, unsigned parentTexture) = 0;
+ virtual void copyTextureToParentTextureCHROMIUM(WebGLId texture, WebGLId parentTexture) = 0;
// GL_CHROMIUM_request_extension
virtual WebString getRequestableExtensionsCHROMIUM() = 0;
virtual void requestExtensionCHROMIUM(const char*) = 0;
// GL_CHROMIUM_framebuffer_multisample
- virtual void blitFramebufferCHROMIUM(int srcX0, int srcY0, int srcX1, int srcY1, int dstX0, int dstY0, int dstX1, int dstY1, unsigned mask, unsigned filter) = 0;
- virtual void renderbufferStorageMultisampleCHROMIUM(unsigned long target, int samples, unsigned internalformat, unsigned width, unsigned height) = 0;
+ virtual void blitFramebufferCHROMIUM(WGC3Dint srcX0, WGC3Dint srcY0, WGC3Dint srcX1, WGC3Dint srcY1, WGC3Dint dstX0, WGC3Dint dstY0, WGC3Dint dstX1, WGC3Dint dstY1, WGC3Dbitfield mask, WGC3Denum filter) = 0;
+ virtual void renderbufferStorageMultisampleCHROMIUM(WGC3Denum target, WGC3Dsizei samples, WGC3Denum internalformat, WGC3Dsizei width, WGC3Dsizei height) = 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 activeTexture(unsigned long texture) = 0;
+ virtual void activeTexture(WGC3Denum texture) = 0;
virtual void attachShader(WebGLId program, WebGLId shader) = 0;
- virtual void bindAttribLocation(WebGLId program, unsigned long index, const char* name) = 0;
- virtual void bindBuffer(unsigned long target, WebGLId buffer) = 0;
- virtual void bindFramebuffer(unsigned long target, WebGLId framebuffer) = 0;
- virtual void bindRenderbuffer(unsigned long target, WebGLId renderbuffer) = 0;
- virtual void bindTexture(unsigned long target, WebGLId texture) = 0;
- virtual void blendColor(double red, double green, double blue, double alpha) = 0;
- virtual void blendEquation(unsigned long mode) = 0;
- virtual void blendEquationSeparate(unsigned long modeRGB, unsigned long modeAlpha) = 0;
- virtual void blendFunc(unsigned long sfactor, unsigned long dfactor) = 0;
- virtual void blendFuncSeparate(unsigned long srcRGB, unsigned long dstRGB, unsigned long srcAlpha, unsigned long dstAlpha) = 0;
-
- virtual void bufferData(unsigned long target, int size, const void* data, unsigned long usage) = 0;
- virtual void bufferSubData(unsigned long target, long offset, int size, const void* data) = 0;
-
- virtual unsigned long checkFramebufferStatus(unsigned long target) = 0;
- virtual void clear(unsigned long mask) = 0;
- virtual void clearColor(double red, double green, double blue, double alpha) = 0;
- virtual void clearDepth(double depth) = 0;
- virtual void clearStencil(long s) = 0;
- virtual void colorMask(bool red, bool green, bool blue, bool alpha) = 0;
+ virtual void bindAttribLocation(WebGLId program, WGC3Duint index, const WGC3Dchar* name) = 0;
+ virtual void bindBuffer(WGC3Denum target, WebGLId buffer) = 0;
+ virtual void bindFramebuffer(WGC3Denum target, WebGLId framebuffer) = 0;
+ virtual void bindRenderbuffer(WGC3Denum target, WebGLId renderbuffer) = 0;
+ virtual void bindTexture(WGC3Denum target, WebGLId texture) = 0;
+ virtual void blendColor(WGC3Dclampf red, WGC3Dclampf green, WGC3Dclampf blue, WGC3Dclampf alpha) = 0;
+ virtual void blendEquation(WGC3Denum mode) = 0;
+ virtual void blendEquationSeparate(WGC3Denum modeRGB, WGC3Denum modeAlpha) = 0;
+ virtual void blendFunc(WGC3Denum sfactor, WGC3Denum dfactor) = 0;
+ virtual void blendFuncSeparate(WGC3Denum srcRGB, WGC3Denum dstRGB, WGC3Denum srcAlpha, WGC3Denum dstAlpha) = 0;
+
+ virtual void bufferData(WGC3Denum target, WGC3Dsizeiptr size, const void* data, WGC3Denum usage) = 0;
+ virtual void bufferSubData(WGC3Denum target, WGC3Dintptr offset, WGC3Dsizeiptr size, const void* data) = 0;
+
+ virtual WGC3Denum checkFramebufferStatus(WGC3Denum target) = 0;
+ virtual void clear(WGC3Dbitfield mask) = 0;
+ virtual void clearColor(WGC3Dclampf red, WGC3Dclampf green, WGC3Dclampf blue, WGC3Dclampf alpha) = 0;
+ virtual void clearDepth(WGC3Dclampf depth) = 0;
+ virtual void clearStencil(WGC3Dint s) = 0;
+ virtual void colorMask(WGC3Dboolean red, WGC3Dboolean green, WGC3Dboolean blue, WGC3Dboolean alpha) = 0;
virtual void compileShader(WebGLId shader) = 0;
- virtual void copyTexImage2D(unsigned long target, long level, unsigned long internalformat, long x, long y, unsigned long width, unsigned long height, long border) = 0;
- virtual void copyTexSubImage2D(unsigned long target, long level, long xoffset, long yoffset, long x, long y, unsigned long width, unsigned long height) = 0;
- virtual void cullFace(unsigned long mode) = 0;
- virtual void depthFunc(unsigned long func) = 0;
- virtual void depthMask(bool flag) = 0;
- virtual void depthRange(double zNear, double zFar) = 0;
+ virtual void copyTexImage2D(WGC3Denum target, WGC3Dint level, WGC3Denum internalformat, WGC3Dint x, WGC3Dint y, WGC3Dsizei width, WGC3Dsizei height, WGC3Dint border) = 0;
+ virtual void copyTexSubImage2D(WGC3Denum target, WGC3Dint level, WGC3Dint xoffset, WGC3Dint yoffset, WGC3Dint x, WGC3Dint y, WGC3Dsizei width, WGC3Dsizei height) = 0;
+ virtual void cullFace(WGC3Denum mode) = 0;
+ virtual void depthFunc(WGC3Denum func) = 0;
+ virtual void depthMask(WGC3Dboolean flag) = 0;
+ virtual void depthRange(WGC3Dclampf zNear, WGC3Dclampf zFar) = 0;
virtual void detachShader(WebGLId program, WebGLId shader) = 0;
- virtual void disable(unsigned long cap) = 0;
- virtual void disableVertexAttribArray(unsigned long index) = 0;
- virtual void drawArrays(unsigned long mode, long first, long count) = 0;
- virtual void drawElements(unsigned long mode, unsigned long count, unsigned long type, long offset) = 0;
+ virtual void disable(WGC3Denum cap) = 0;
+ virtual void disableVertexAttribArray(WGC3Duint index) = 0;
+ virtual void drawArrays(WGC3Denum mode, WGC3Dint first, WGC3Dsizei count) = 0;
+ virtual void drawElements(WGC3Denum mode, WGC3Dsizei count, WGC3Denum type, WGC3Dintptr offset) = 0;
- virtual void enable(unsigned long cap) = 0;
- virtual void enableVertexAttribArray(unsigned long index) = 0;
+ virtual void enable(WGC3Denum cap) = 0;
+ virtual void enableVertexAttribArray(WGC3Duint index) = 0;
virtual void finish() = 0;
virtual void flush() = 0;
- virtual void framebufferRenderbuffer(unsigned long target, unsigned long attachment, unsigned long renderbuffertarget, WebGLId renderbuffer) = 0;
- virtual void framebufferTexture2D(unsigned long target, unsigned long attachment, unsigned long textarget, WebGLId texture, long level) = 0;
- virtual void frontFace(unsigned long mode) = 0;
- virtual void generateMipmap(unsigned long target) = 0;
-
- virtual bool getActiveAttrib(WebGLId program, unsigned long index, ActiveInfo&) = 0;
- virtual bool getActiveUniform(WebGLId program, unsigned long index, ActiveInfo&) = 0;
-
- virtual void getAttachedShaders(WebGLId program, int maxCount, int* count, unsigned int* shaders) = 0;
-
- virtual int getAttribLocation(WebGLId program, const char* name) = 0;
-
- virtual void getBooleanv(unsigned long pname, unsigned char* value) = 0;
-
- virtual void getBufferParameteriv(unsigned long target, unsigned long pname, int* value) = 0;
-
+ virtual void framebufferRenderbuffer(WGC3Denum target, WGC3Denum attachment, WGC3Denum renderbuffertarget, WebGLId renderbuffer) = 0;
+ virtual void framebufferTexture2D(WGC3Denum target, WGC3Denum attachment, WGC3Denum textarget, WebGLId texture, WGC3Dint level) = 0;
+ virtual void frontFace(WGC3Denum mode) = 0;
+ virtual void generateMipmap(WGC3Denum target) = 0;
+
+ virtual bool getActiveAttrib(WebGLId program, WGC3Duint index, ActiveInfo&) = 0;
+ virtual bool getActiveUniform(WebGLId program, WGC3Duint index, ActiveInfo&) = 0;
+ virtual void getAttachedShaders(WebGLId program, WGC3Dsizei maxCount, WGC3Dsizei* count, WebGLId* shaders) = 0;
+ virtual WGC3Dint getAttribLocation(WebGLId program, const WGC3Dchar* name) = 0;
+ virtual void getBooleanv(WGC3Denum pname, WGC3Dboolean* value) = 0;
+ virtual void getBufferParameteriv(WGC3Denum target, WGC3Denum pname, WGC3Dint* value) = 0;
virtual Attributes getContextAttributes() = 0;
-
- virtual unsigned long getError() = 0;
-
- virtual bool isContextLost() = 0;
-
- virtual void getFloatv(unsigned long pname, float* value) = 0;
-
- virtual void getFramebufferAttachmentParameteriv(unsigned long target, unsigned long attachment, unsigned long pname, int* value) = 0;
-
- virtual void getIntegerv(unsigned long pname, int* value) = 0;
-
- virtual void getProgramiv(WebGLId program, unsigned long pname, int* value) = 0;
-
+ virtual WGC3Denum getError() = 0;
+ virtual void getFloatv(WGC3Denum pname, WGC3Dfloat* value) = 0;
+ virtual void getFramebufferAttachmentParameteriv(WGC3Denum target, WGC3Denum attachment, WGC3Denum pname, WGC3Dint* value) = 0;
+ virtual void getIntegerv(WGC3Denum pname, WGC3Dint* value) = 0;
+ virtual void getProgramiv(WebGLId program, WGC3Denum pname, WGC3Dint* value) = 0;
virtual WebString getProgramInfoLog(WebGLId program) = 0;
-
- virtual void getRenderbufferParameteriv(unsigned long target, unsigned long pname, int* value) = 0;
-
- virtual void getShaderiv(WebGLId shader, unsigned long pname, int* value) = 0;
-
+ virtual void getRenderbufferParameteriv(WGC3Denum target, WGC3Denum pname, WGC3Dint* value) = 0;
+ virtual void getShaderiv(WebGLId shader, WGC3Denum pname, WGC3Dint* value) = 0;
virtual WebString getShaderInfoLog(WebGLId shader) = 0;
// TBD
// void glGetShaderPrecisionFormat (GLenum shadertype, GLenum precisiontype, GLint* range, GLint* precision);
virtual WebString getShaderSource(WebGLId shader) = 0;
- virtual WebString getString(unsigned long name) = 0;
-
- virtual void getTexParameterfv(unsigned long target, unsigned long pname, float* value) = 0;
- virtual void getTexParameteriv(unsigned long target, unsigned long pname, int* value) = 0;
-
- virtual void getUniformfv(WebGLId program, long location, float* value) = 0;
- virtual void getUniformiv(WebGLId program, long location, int* value) = 0;
-
- virtual long getUniformLocation(WebGLId program, const char* name) = 0;
-
- virtual void getVertexAttribfv(unsigned long index, unsigned long pname, float* value) = 0;
- virtual void getVertexAttribiv(unsigned long index, unsigned long pname, int* value) = 0;
-
- virtual long getVertexAttribOffset(unsigned long index, unsigned long pname) = 0;
-
- virtual void hint(unsigned long target, unsigned long mode) = 0;
- virtual bool isBuffer(WebGLId buffer) = 0;
- virtual bool isEnabled(unsigned long cap) = 0;
- virtual bool isFramebuffer(WebGLId framebuffer) = 0;
- virtual bool isProgram(WebGLId program) = 0;
- virtual bool isRenderbuffer(WebGLId renderbuffer) = 0;
- virtual bool isShader(WebGLId shader) = 0;
- virtual bool isTexture(WebGLId texture) = 0;
- virtual void lineWidth(double) = 0;
+ virtual WebString getString(WGC3Denum name) = 0;
+ virtual void getTexParameterfv(WGC3Denum target, WGC3Denum pname, WGC3Dfloat* value) = 0;
+ virtual void getTexParameteriv(WGC3Denum target, WGC3Denum pname, WGC3Dint* value) = 0;
+ virtual void getUniformfv(WebGLId program, WGC3Dint location, WGC3Dfloat* value) = 0;
+ virtual void getUniformiv(WebGLId program, WGC3Dint location, WGC3Dint* value) = 0;
+ virtual WGC3Dint getUniformLocation(WebGLId program, const WGC3Dchar* name) = 0;
+ virtual void getVertexAttribfv(WGC3Duint index, WGC3Denum pname, WGC3Dfloat* value) = 0;
+ virtual void getVertexAttribiv(WGC3Duint index, WGC3Denum pname, WGC3Dint* value) = 0;
+ virtual WGC3Dsizeiptr getVertexAttribOffset(WGC3Duint index, WGC3Denum pname) = 0;
+
+ virtual void hint(WGC3Denum target, WGC3Denum mode) = 0;
+ virtual WGC3Dboolean isBuffer(WebGLId buffer) = 0;
+ virtual WGC3Dboolean isEnabled(WGC3Denum cap) = 0;
+ virtual WGC3Dboolean isFramebuffer(WebGLId framebuffer) = 0;
+ virtual WGC3Dboolean isProgram(WebGLId program) = 0;
+ virtual WGC3Dboolean isRenderbuffer(WebGLId renderbuffer) = 0;
+ virtual WGC3Dboolean isShader(WebGLId shader) = 0;
+ virtual WGC3Dboolean isTexture(WebGLId texture) = 0;
+ virtual void lineWidth(WGC3Dfloat) = 0;
virtual void linkProgram(WebGLId program) = 0;
- virtual void pixelStorei(unsigned long pname, long param) = 0;
- virtual void polygonOffset(double factor, double units) = 0;
+ virtual void pixelStorei(WGC3Denum pname, WGC3Dint param) = 0;
+ virtual void polygonOffset(WGC3Dfloat factor, WGC3Dfloat units) = 0;
- virtual void readPixels(long x, long y, unsigned long width, unsigned long height, unsigned long format, unsigned long type, void* pixels) = 0;
+ virtual void readPixels(WGC3Dint x, WGC3Dint y, WGC3Dsizei width, WGC3Dsizei height, WGC3Denum format, WGC3Denum type, void* pixels) = 0;
virtual void releaseShaderCompiler() = 0;
- virtual void renderbufferStorage(unsigned long target, unsigned long internalformat, unsigned long width, unsigned long height) = 0;
- virtual void sampleCoverage(double value, bool invert) = 0;
- virtual void scissor(long x, long y, unsigned long width, unsigned long height) = 0;
- virtual void shaderSource(WebGLId shader, const char* string) = 0;
- virtual void stencilFunc(unsigned long func, long ref, unsigned long mask) = 0;
- virtual void stencilFuncSeparate(unsigned long face, unsigned long func, long ref, unsigned long mask) = 0;
- virtual void stencilMask(unsigned long mask) = 0;
- virtual void stencilMaskSeparate(unsigned long face, unsigned long mask) = 0;
- virtual void stencilOp(unsigned long fail, unsigned long zfail, unsigned long zpass) = 0;
- virtual void stencilOpSeparate(unsigned long face, unsigned long fail, unsigned long zfail, unsigned long zpass) = 0;
-
- virtual void texImage2D(unsigned target, unsigned level, unsigned internalformat, unsigned width, unsigned height, unsigned border, unsigned format, unsigned type, const void* pixels) = 0;
-
- virtual void texParameterf(unsigned target, unsigned pname, float param) = 0;
- virtual void texParameteri(unsigned target, unsigned pname, int param) = 0;
-
- virtual void texSubImage2D(unsigned target, unsigned level, unsigned xoffset, unsigned yoffset, unsigned width, unsigned height, unsigned format, unsigned type, const void* pixels) = 0;
-
- virtual void uniform1f(long location, float x) = 0;
- virtual void uniform1fv(long location, int count, float* v) = 0;
- virtual void uniform1i(long location, int x) = 0;
- virtual void uniform1iv(long location, int count, int* v) = 0;
- virtual void uniform2f(long location, float x, float y) = 0;
- virtual void uniform2fv(long location, int count, float* v) = 0;
- virtual void uniform2i(long location, int x, int y) = 0;
- virtual void uniform2iv(long location, int count, int* v) = 0;
- virtual void uniform3f(long location, float x, float y, float z) = 0;
- virtual void uniform3fv(long location, int count, float* v) = 0;
- virtual void uniform3i(long location, int x, int y, int z) = 0;
- virtual void uniform3iv(long location, int count, int* v) = 0;
- virtual void uniform4f(long location, float x, float y, float z, float w) = 0;
- virtual void uniform4fv(long location, int count, float* v) = 0;
- virtual void uniform4i(long location, int x, int y, int z, int w) = 0;
- virtual void uniform4iv(long location, int count, int* v) = 0;
- virtual void uniformMatrix2fv(long location, int count, bool transpose, const float* value) = 0;
- virtual void uniformMatrix3fv(long location, int count, bool transpose, const float* value) = 0;
- virtual void uniformMatrix4fv(long location, int count, bool transpose, const float* value) = 0;
+
+ virtual void renderbufferStorage(WGC3Denum target, WGC3Denum internalformat, WGC3Dsizei width, WGC3Dsizei height) = 0;
+ virtual void sampleCoverage(WGC3Dclampf value, WGC3Dboolean invert) = 0;
+ virtual void scissor(WGC3Dint x, WGC3Dint y, WGC3Dsizei width, WGC3Dsizei height) = 0;
+ virtual void shaderSource(WebGLId shader, const WGC3Dchar* string) = 0;
+ virtual void stencilFunc(WGC3Denum func, WGC3Dint ref, WGC3Duint mask) = 0;
+ virtual void stencilFuncSeparate(WGC3Denum face, WGC3Denum func, WGC3Dint ref, WGC3Duint mask) = 0;
+ virtual void stencilMask(WGC3Duint mask) = 0;
+ virtual void stencilMaskSeparate(WGC3Denum face, WGC3Duint mask) = 0;
+ virtual void stencilOp(WGC3Denum fail, WGC3Denum zfail, WGC3Denum zpass) = 0;
+ virtual void stencilOpSeparate(WGC3Denum face, WGC3Denum fail, WGC3Denum zfail, WGC3Denum zpass) = 0;
+
+ virtual void texImage2D(WGC3Denum target, WGC3Dint level, WGC3Denum internalformat, WGC3Dsizei width, WGC3Dsizei height, WGC3Dint border, WGC3Denum format, WGC3Denum type, const void* pixels) = 0;
+
+ virtual void texParameterf(WGC3Denum target, WGC3Denum pname, WGC3Dfloat param) = 0;
+ virtual void texParameteri(WGC3Denum target, WGC3Denum pname, WGC3Dint param) = 0;
+
+ virtual void texSubImage2D(WGC3Denum target, WGC3Dint level, WGC3Dint xoffset, WGC3Dint yoffset, WGC3Dsizei width, WGC3Dsizei height, WGC3Denum format, WGC3Denum type, const void* pixels) = 0;
+
+ virtual void uniform1f(WGC3Dint location, WGC3Dfloat x) = 0;
+ virtual void uniform1fv(WGC3Dint location, WGC3Dsizei count, const WGC3Dfloat* v) = 0;
+ virtual void uniform1i(WGC3Dint location, WGC3Dint x) = 0;
+ virtual void uniform1iv(WGC3Dint location, WGC3Dsizei count, const WGC3Dint* v) = 0;
+ virtual void uniform2f(WGC3Dint location, WGC3Dfloat x, WGC3Dfloat y) = 0;
+ virtual void uniform2fv(WGC3Dint location, WGC3Dsizei count, const WGC3Dfloat* v) = 0;
+ virtual void uniform2i(WGC3Dint location, WGC3Dint x, WGC3Dint y) = 0;
+ virtual void uniform2iv(WGC3Dint location, WGC3Dsizei count, const WGC3Dint* v) = 0;
+ virtual void uniform3f(WGC3Dint location, WGC3Dfloat x, WGC3Dfloat y, WGC3Dfloat z) = 0;
+ virtual void uniform3fv(WGC3Dint location, WGC3Dsizei count, const WGC3Dfloat* v) = 0;
+ virtual void uniform3i(WGC3Dint location, WGC3Dint x, WGC3Dint y, WGC3Dint z) = 0;
+ virtual void uniform3iv(WGC3Dint location, WGC3Dsizei count, const WGC3Dint* v) = 0;
+ virtual void uniform4f(WGC3Dint location, WGC3Dfloat x, WGC3Dfloat y, WGC3Dfloat z, WGC3Dfloat w) = 0;
+ virtual void uniform4fv(WGC3Dint location, WGC3Dsizei count, const WGC3Dfloat* v) = 0;
+ virtual void uniform4i(WGC3Dint location, WGC3Dint x, WGC3Dint y, WGC3Dint z, WGC3Dint w) = 0;
+ virtual void uniform4iv(WGC3Dint location, WGC3Dsizei count, const WGC3Dint* v) = 0;
+ virtual void uniformMatrix2fv(WGC3Dint location, WGC3Dsizei count, WGC3Dboolean transpose, const WGC3Dfloat* value) = 0;
+ virtual void uniformMatrix3fv(WGC3Dint location, WGC3Dsizei count, WGC3Dboolean transpose, const WGC3Dfloat* value) = 0;
+ virtual void uniformMatrix4fv(WGC3Dint location, WGC3Dsizei count, WGC3Dboolean transpose, const WGC3Dfloat* value) = 0;
virtual void useProgram(WebGLId program) = 0;
virtual void validateProgram(WebGLId program) = 0;
- virtual void vertexAttrib1f(unsigned long indx, float x) = 0;
- virtual void vertexAttrib1fv(unsigned long indx, const float* values) = 0;
- virtual void vertexAttrib2f(unsigned long indx, float x, float y) = 0;
- virtual void vertexAttrib2fv(unsigned long indx, const float* values) = 0;
- virtual void vertexAttrib3f(unsigned long indx, float x, float y, float z) = 0;
- virtual void vertexAttrib3fv(unsigned long indx, const float* values) = 0;
- virtual void vertexAttrib4f(unsigned long indx, float x, float y, float z, float w) = 0;
- virtual void vertexAttrib4fv(unsigned long indx, const float* values) = 0;
- virtual void vertexAttribPointer(unsigned long indx, int size, int type, bool normalized,
- unsigned long stride, unsigned long offset) = 0;
+ virtual void vertexAttrib1f(WGC3Duint index, WGC3Dfloat x) = 0;
+ virtual void vertexAttrib1fv(WGC3Duint index, const WGC3Dfloat* values) = 0;
+ virtual void vertexAttrib2f(WGC3Duint index, WGC3Dfloat x, WGC3Dfloat y) = 0;
+ virtual void vertexAttrib2fv(WGC3Duint index, const WGC3Dfloat* values) = 0;
+ virtual void vertexAttrib3f(WGC3Duint index, WGC3Dfloat x, WGC3Dfloat y, WGC3Dfloat z) = 0;
+ virtual void vertexAttrib3fv(WGC3Duint index, const WGC3Dfloat* values) = 0;
+ virtual void vertexAttrib4f(WGC3Duint index, WGC3Dfloat x, WGC3Dfloat y, WGC3Dfloat z, WGC3Dfloat w) = 0;
+ virtual void vertexAttrib4fv(WGC3Duint index, const WGC3Dfloat* values) = 0;
+ virtual void vertexAttribPointer(WGC3Duint index, WGC3Dint size, WGC3Denum type, WGC3Dboolean normalized,
+ WGC3Dsizei stride, WGC3Dintptr offset) = 0;
- virtual void viewport(long x, long y, unsigned long width, unsigned long height) = 0;
+ virtual void viewport(WGC3Dint x, WGC3Dint y, WGC3Dsizei width, WGC3Dsizei height) = 0;
// Support for buffer creation and deletion.
- virtual unsigned createBuffer() = 0;
- virtual unsigned createFramebuffer() = 0;
- virtual unsigned createProgram() = 0;
- virtual unsigned createRenderbuffer() = 0;
- virtual unsigned createShader(unsigned long) = 0;
- virtual unsigned createTexture() = 0;
-
- virtual void deleteBuffer(unsigned) = 0;
- virtual void deleteFramebuffer(unsigned) = 0;
- virtual void deleteProgram(unsigned) = 0;
- virtual void deleteRenderbuffer(unsigned) = 0;
- virtual void deleteShader(unsigned) = 0;
- virtual void deleteTexture(unsigned) = 0;
+ virtual WebGLId createBuffer() = 0;
+ virtual WebGLId createFramebuffer() = 0;
+ virtual WebGLId createProgram() = 0;
+ virtual WebGLId createRenderbuffer() = 0;
+ virtual WebGLId createShader(WGC3Denum) = 0;
+ virtual WebGLId createTexture() = 0;
+
+ virtual void deleteBuffer(WebGLId) = 0;
+ virtual void deleteFramebuffer(WebGLId) = 0;
+ virtual void deleteProgram(WebGLId) = 0;
+ virtual void deleteRenderbuffer(WebGLId) = 0;
+ virtual void deleteShader(WebGLId) = 0;
+ virtual void deleteTexture(WebGLId) = 0;
virtual void setContextLostCallback(WebGraphicsContextLostCallback* callback) {}
};
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list