mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

b=551771; WebGL calls broken with boolean args in loop (qsgen octet handling); also rename all WebGL types to avoid conflicts with system GL types; r=jorendroff,joe

This commit is contained in:
Vladimir Vukicevic 2010-05-28 15:52:39 -07:00
Родитель 50e34c9a93
Коммит ebae707308
7 изменённых файлов: 446 добавлений и 517 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
content/canvas/src/CustomQS_WebGL.h
Просмотреть файл

@ -237,7 +237,7 @@ nsICanvasRenderingContextWebGL_TexImage2D(JSContext *cx, uintN argc, jsval *vp)
return JS_FALSE; return JS_FALSE;
} }
rv = self->TexImage2D_dom(intargs[0], intargs[1], elt, (GLboolean) intargs[3], (GLboolean) intargs[4]); rv = self->TexImage2D_dom(intargs[0], intargs[1], elt, (WebGLboolean) intargs[3], (WebGLboolean) intargs[4]);
goto check_rv_and_return; goto check_rv_and_return;
} }
} }
@ -334,7 +334,7 @@ nsICanvasRenderingContextWebGL_TexSubImage2D(JSContext *cx, uintN argc, jsval *v
if (NS_SUCCEEDED(rv)) { if (NS_SUCCEEDED(rv)) {
rv = self->TexSubImage2D_dom(intargs[0], intargs[1], intargs[2], rv = self->TexSubImage2D_dom(intargs[0], intargs[1], intargs[2],
intargs[2], intargs[4], intargs[5], intargs[2], intargs[4], intargs[5],
elt, (GLboolean) intargs[7], (GLboolean) intargs[8]); elt, (WebGLboolean) intargs[7], (WebGLboolean) intargs[8]);
if (NS_FAILED(rv)) if (NS_FAILED(rv))
return xpc_qsThrowMethodFailed(cx, rv, vp); return xpc_qsThrowMethodFailed(cx, rv, vp);
return JS_TRUE; return JS_TRUE;

69
content/canvas/src/WebGLContext.cpp
Просмотреть файл

@ -417,62 +417,15 @@ NS_INTERFACE_MAP_BEGIN(WebGLRenderbuffer)
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(WebGLRenderbuffer) NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(WebGLRenderbuffer)
NS_INTERFACE_MAP_END NS_INTERFACE_MAP_END
/* [noscript] attribute GLuint name; */ #define NAME_NOT_SUPPORTED(base) \
NS_IMETHODIMP WebGLTexture::GetName(GLuint *aName) NS_IMETHODIMP base::GetName(WebGLuint *aName) \
{ { return NS_ERROR_NOT_IMPLEMENTED; } \
return NS_ERROR_NOT_IMPLEMENTED; NS_IMETHODIMP base::SetName(WebGLuint aName) \
} { return NS_ERROR_NOT_IMPLEMENTED; }
NS_IMETHODIMP WebGLTexture::SetName(GLuint aName)
{
return NS_ERROR_NOT_IMPLEMENTED;
}
/* [noscript] attribute GLuint name; */ NAME_NOT_SUPPORTED(WebGLTexture)
NS_IMETHODIMP WebGLBuffer::GetName(GLuint *aName) NAME_NOT_SUPPORTED(WebGLBuffer)
{ NAME_NOT_SUPPORTED(WebGLProgram)
return NS_ERROR_NOT_IMPLEMENTED; NAME_NOT_SUPPORTED(WebGLShader)
} NAME_NOT_SUPPORTED(WebGLFramebuffer)
NS_IMETHODIMP WebGLBuffer::SetName(GLuint aName) NAME_NOT_SUPPORTED(WebGLRenderbuffer)
{
return NS_ERROR_NOT_IMPLEMENTED;
}
/* [noscript] attribute GLuint name; */
NS_IMETHODIMP WebGLProgram::GetName(GLuint *aName)
{
return NS_ERROR_NOT_IMPLEMENTED;
}
NS_IMETHODIMP WebGLProgram::SetName(GLuint aName)
{
return NS_ERROR_NOT_IMPLEMENTED;
}
/* [noscript] attribute GLuint name; */
NS_IMETHODIMP WebGLShader::GetName(GLuint *aName)
{
return NS_ERROR_NOT_IMPLEMENTED;
}
NS_IMETHODIMP WebGLShader::SetName(GLuint aName)
{
return NS_ERROR_NOT_IMPLEMENTED;
}
/* [noscript] attribute GLuint name; */
NS_IMETHODIMP WebGLFramebuffer::GetName(GLuint *aName)
{
return NS_ERROR_NOT_IMPLEMENTED;
}
NS_IMETHODIMP WebGLFramebuffer::SetName(GLuint aName)
{
return NS_ERROR_NOT_IMPLEMENTED;
}
/* [noscript] attribute GLuint name; */
NS_IMETHODIMP WebGLRenderbuffer::GetName(GLuint *aName)
{
return NS_ERROR_NOT_IMPLEMENTED;
}
NS_IMETHODIMP WebGLRenderbuffer::SetName(GLuint aName)
{
return NS_ERROR_NOT_IMPLEMENTED;
}

80
content/canvas/src/WebGLContext.h
Просмотреть файл

@ -214,9 +214,9 @@ struct WebGLVertexAttribData {
{ } { }
WebGLObjectRefPtr<WebGLBuffer> buf; WebGLObjectRefPtr<WebGLBuffer> buf;
GLuint stride; WebGLuint stride;
GLuint size; WebGLuint size;
GLuint offset; WebGLuint offset;
PRBool enabled; PRBool enabled;
}; };
@ -244,8 +244,8 @@ public:
NS_IMETHOD GetThebesSurface(gfxASurface **surface); NS_IMETHOD GetThebesSurface(gfxASurface **surface);
NS_IMETHOD SetIsOpaque(PRBool b) { return NS_OK; }; NS_IMETHOD SetIsOpaque(PRBool b) { return NS_OK; };
nsresult SynthesizeGLError(GLenum err); nsresult SynthesizeGLError(WebGLenum err);
nsresult SynthesizeGLError(GLenum err, const char *fmt, ...); nsresult SynthesizeGLError(WebGLenum err, const char *fmt, ...);
nsresult ErrorInvalidEnum(const char *fmt, ...); nsresult ErrorInvalidEnum(const char *fmt, ...);
nsresult ErrorInvalidOperation(const char *fmt, ...); nsresult ErrorInvalidOperation(const char *fmt, ...);
@ -263,8 +263,8 @@ protected:
PRBool mInvalidated; PRBool mInvalidated;
GLuint mActiveTexture; WebGLuint mActiveTexture;
GLenum mSynthesizedGLError; WebGLenum mSynthesizedGLError;
PRBool SafeToCreateCanvas3DContext(nsHTMLCanvasElement *canvasElement); PRBool SafeToCreateCanvas3DContext(nsHTMLCanvasElement *canvasElement);
PRBool ValidateGL(); PRBool ValidateGL();
@ -275,14 +275,14 @@ protected:
void MakeContextCurrent() { gl->MakeCurrent(); } void MakeContextCurrent() { gl->MakeCurrent(); }
// helpers // helpers
nsresult TexImage2D_base(GLenum target, GLint level, GLenum internalformat, nsresult TexImage2D_base(WebGLenum target, WebGLint level, WebGLenum internalformat,
GLsizei width, GLsizei height, GLint border, WebGLsizei width, WebGLsizei height, WebGLint border,
GLenum format, GLenum type, WebGLenum format, WebGLenum type,
void *data, PRUint32 byteLength); void *data, PRUint32 byteLength);
nsresult TexSubImage2D_base(GLenum target, GLint level, nsresult TexSubImage2D_base(WebGLenum target, WebGLint level,
GLint xoffset, GLint yoffset, WebGLint xoffset, WebGLint yoffset,
GLsizei width, GLsizei height, WebGLsizei width, WebGLsizei height,
GLenum format, GLenum type, WebGLenum format, WebGLenum type,
void *pixels, PRUint32 byteLength); void *pixels, PRUint32 byteLength);
nsresult DOMElementToImageSurface(nsIDOMElement *imageOrCanvas, nsresult DOMElementToImageSurface(nsIDOMElement *imageOrCanvas,
@ -364,13 +364,13 @@ protected:
: mWidth(0), mHeight(0) { } : mWidth(0), mHeight(0) { }
public: public:
GLsizei width() { return mWidth; } WebGLsizei width() { return mWidth; }
void width(GLsizei value) { mWidth = value; } void width(WebGLsizei value) { mWidth = value; }
GLsizei height() { return mHeight; } WebGLsizei height() { return mHeight; }
void height(GLsizei value) { mHeight = value; } void height(WebGLsizei value) { mHeight = value; }
void setDimensions(GLsizei width, GLsizei height) { void setDimensions(WebGLsizei width, WebGLsizei height) {
mWidth = width; mWidth = width;
mHeight = height; mHeight = height;
} }
@ -386,8 +386,8 @@ public:
} }
protected: protected:
GLsizei mWidth; WebGLsizei mWidth;
GLsizei mHeight; WebGLsizei mHeight;
}; };
#define WEBGLBUFFER_PRIVATE_IID \ #define WEBGLBUFFER_PRIVATE_IID \
@ -399,7 +399,7 @@ class WebGLBuffer :
public: public:
NS_DECLARE_STATIC_IID_ACCESSOR(WEBGLBUFFER_PRIVATE_IID) NS_DECLARE_STATIC_IID_ACCESSOR(WEBGLBUFFER_PRIVATE_IID)
WebGLBuffer(GLuint name) WebGLBuffer(WebGLuint name)
: mName(name), mDeleted(PR_FALSE), mByteLength(0) : mName(name), mDeleted(PR_FALSE), mByteLength(0)
{ } { }
@ -413,17 +413,17 @@ public:
} }
PRBool Deleted() { return mDeleted; } PRBool Deleted() { return mDeleted; }
GLuint GLName() { return mName; } WebGLuint GLName() { return mName; }
PRUint32 ByteLength() { return mByteLength; } PRUint32 ByteLength() { return mByteLength; }
void SetByteLength(GLuint len) { void SetByteLength(WebGLuint len) {
mByteLength = len; mByteLength = len;
} }
NS_DECL_ISUPPORTS NS_DECL_ISUPPORTS
NS_DECL_NSIWEBGLBUFFER NS_DECL_NSIWEBGLBUFFER
protected: protected:
GLuint mName; WebGLuint mName;
PRBool mDeleted; PRBool mDeleted;
PRUint32 mByteLength; PRUint32 mByteLength;
}; };
@ -440,7 +440,7 @@ class WebGLTexture :
public: public:
NS_DECLARE_STATIC_IID_ACCESSOR(WEBGLTEXTURE_PRIVATE_IID) NS_DECLARE_STATIC_IID_ACCESSOR(WEBGLTEXTURE_PRIVATE_IID)
WebGLTexture(GLuint name) : WebGLTexture(WebGLuint name) :
mName(name), mDeleted(PR_FALSE) { } mName(name), mDeleted(PR_FALSE) { }
void Delete() { void Delete() {
@ -451,12 +451,12 @@ public:
} }
PRBool Deleted() { return mDeleted; } PRBool Deleted() { return mDeleted; }
GLuint GLName() { return mName; } WebGLuint GLName() { return mName; }
NS_DECL_ISUPPORTS NS_DECL_ISUPPORTS
NS_DECL_NSIWEBGLTEXTURE NS_DECL_NSIWEBGLTEXTURE
protected: protected:
GLuint mName; WebGLuint mName;
PRBool mDeleted; PRBool mDeleted;
}; };
@ -471,7 +471,7 @@ class WebGLProgram :
public: public:
NS_DECLARE_STATIC_IID_ACCESSOR(WEBGLPROGRAM_PRIVATE_IID) NS_DECLARE_STATIC_IID_ACCESSOR(WEBGLPROGRAM_PRIVATE_IID)
WebGLProgram(GLuint name) : WebGLProgram(WebGLuint name) :
mName(name), mDeleted(PR_FALSE) { } mName(name), mDeleted(PR_FALSE) { }
void Delete() { void Delete() {
@ -481,12 +481,12 @@ public:
mDeleted = PR_TRUE; mDeleted = PR_TRUE;
} }
PRBool Deleted() { return mDeleted; } PRBool Deleted() { return mDeleted; }
GLuint GLName() { return mName; } WebGLuint GLName() { return mName; }
NS_DECL_ISUPPORTS NS_DECL_ISUPPORTS
NS_DECL_NSIWEBGLPROGRAM NS_DECL_NSIWEBGLPROGRAM
protected: protected:
GLuint mName; WebGLuint mName;
PRBool mDeleted; PRBool mDeleted;
}; };
@ -501,7 +501,7 @@ class WebGLShader :
public: public:
NS_DECLARE_STATIC_IID_ACCESSOR(WEBGLSHADER_PRIVATE_IID) NS_DECLARE_STATIC_IID_ACCESSOR(WEBGLSHADER_PRIVATE_IID)
WebGLShader(GLuint name) : WebGLShader(WebGLuint name) :
mName(name), mDeleted(PR_FALSE) { } mName(name), mDeleted(PR_FALSE) { }
void Delete() { void Delete() {
@ -511,12 +511,12 @@ public:
mDeleted = PR_TRUE; mDeleted = PR_TRUE;
} }
PRBool Deleted() { return mDeleted; } PRBool Deleted() { return mDeleted; }
GLuint GLName() { return mName; } WebGLuint GLName() { return mName; }
NS_DECL_ISUPPORTS NS_DECL_ISUPPORTS
NS_DECL_NSIWEBGLSHADER NS_DECL_NSIWEBGLSHADER
protected: protected:
GLuint mName; WebGLuint mName;
PRBool mDeleted; PRBool mDeleted;
}; };
@ -532,7 +532,7 @@ class WebGLFramebuffer :
public: public:
NS_DECLARE_STATIC_IID_ACCESSOR(WEBGLFRAMEBUFFER_PRIVATE_IID) NS_DECLARE_STATIC_IID_ACCESSOR(WEBGLFRAMEBUFFER_PRIVATE_IID)
WebGLFramebuffer(GLuint name) : WebGLFramebuffer(WebGLuint name) :
mName(name), mDeleted(PR_FALSE) { } mName(name), mDeleted(PR_FALSE) { }
void Delete() { void Delete() {
@ -542,12 +542,12 @@ public:
mDeleted = PR_TRUE; mDeleted = PR_TRUE;
} }
PRBool Deleted() { return mDeleted; } PRBool Deleted() { return mDeleted; }
GLuint GLName() { return mName; } WebGLuint GLName() { return mName; }
NS_DECL_ISUPPORTS NS_DECL_ISUPPORTS
NS_DECL_NSIWEBGLFRAMEBUFFER NS_DECL_NSIWEBGLFRAMEBUFFER
protected: protected:
GLuint mName; WebGLuint mName;
PRBool mDeleted; PRBool mDeleted;
}; };
@ -563,7 +563,7 @@ class WebGLRenderbuffer :
public: public:
NS_DECLARE_STATIC_IID_ACCESSOR(WEBGLRENDERBUFFER_PRIVATE_IID) NS_DECLARE_STATIC_IID_ACCESSOR(WEBGLRENDERBUFFER_PRIVATE_IID)
WebGLRenderbuffer(GLuint name) : WebGLRenderbuffer(WebGLuint name) :
mName(name), mDeleted(PR_FALSE) { } mName(name), mDeleted(PR_FALSE) { }
void Delete() { void Delete() {
@ -573,12 +573,12 @@ public:
mDeleted = PR_TRUE; mDeleted = PR_TRUE;
} }
PRBool Deleted() { return mDeleted; } PRBool Deleted() { return mDeleted; }
GLuint GLName() { return mName; } WebGLuint GLName() { return mName; }
NS_DECL_ISUPPORTS NS_DECL_ISUPPORTS
NS_DECL_NSIWEBGLRENDERBUFFER NS_DECL_NSIWEBGLRENDERBUFFER
protected: protected:
GLuint mName; WebGLuint mName;
PRBool mDeleted; PRBool mDeleted;
}; };

394
content/canvas/src/WebGLContextGL.cpp
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

4
content/canvas/src/WebGLContextUtils.cpp
Просмотреть файл

@ -224,7 +224,7 @@ WebGLContext::LogMessage(const char *fmt, va_list ap)
} }
nsresult nsresult
WebGLContext::SynthesizeGLError(GLenum err) WebGLContext::SynthesizeGLError(WebGLenum err)
{ {
// If there is already a pending error, don't overwrite it; // If there is already a pending error, don't overwrite it;
// but if there isn't, then we need to check for a gl error // but if there isn't, then we need to check for a gl error
@ -244,7 +244,7 @@ WebGLContext::SynthesizeGLError(GLenum err)
} }
nsresult nsresult
WebGLContext::SynthesizeGLError(GLenum err, const char *fmt, ...) WebGLContext::SynthesizeGLError(WebGLenum err, const char *fmt, ...)
{ {
va_list va; va_list va;
va_start(va, fmt); va_start(va, fmt);

410
dom/interfaces/canvas/nsICanvasRenderingContextWebGL.idl
Просмотреть файл

@ -43,24 +43,14 @@ interface nsIDOMHTMLCanvasElement;
// XXX should we comment out these typedefs in the C++ header? // XXX should we comment out these typedefs in the C++ header?
typedef unsigned long GLenum; typedef unsigned long WebGLenum;
typedef octet GLboolean; typedef boolean WebGLboolean;
typedef unsigned long GLbitfield; typedef unsigned long WebGLbitfield;
typedef short GLshort; typedef long WebGLint;
typedef long GLint; typedef long WebGLsizei;
typedef long GLsizei; typedef unsigned long WebGLuint;
typedef octet GLubyte; typedef float WebGLfloat;
typedef unsigned short GLushort; typedef float WebGLclampf;
typedef unsigned long GLuint;
typedef float GLfloat;
typedef float GLclampf;
typedef long GLfixed;
// XPIDL doesn't have a signed byte?
//typedef signed octet GLbyte;
//typedef unsigned long GLintptr;
//typedef long GLsizeiptr;
%{C++ %{C++
namespace js { namespace js {
@ -82,25 +72,25 @@ struct TypedArray;
[scriptable, uuid(3b43762a-8305-11de-98ab-000c29206271)] [scriptable, uuid(3b43762a-8305-11de-98ab-000c29206271)]
interface nsIWebGLTexture : nsISupports interface nsIWebGLTexture : nsISupports
{ {
[noscript] attribute GLuint name; [noscript] attribute WebGLuint name;
}; };
[scriptable, uuid(9eca9c32-8305-11de-b89b-000c29206271)] [scriptable, uuid(9eca9c32-8305-11de-b89b-000c29206271)]
interface nsIWebGLBuffer : nsISupports interface nsIWebGLBuffer : nsISupports
{ {
[noscript] attribute GLuint name; [noscript] attribute WebGLuint name;
}; };
[scriptable, uuid(a6a19e74-8305-11de-9ce9-000c29206271)] [scriptable, uuid(a6a19e74-8305-11de-9ce9-000c29206271)]
interface nsIWebGLProgram : nsISupports interface nsIWebGLProgram : nsISupports
{ {
[noscript] attribute GLuint name; [noscript] attribute WebGLuint name;
}; };
[scriptable, uuid(ac7440a4-8305-11de-807b-000c29206271)] [scriptable, uuid(ac7440a4-8305-11de-807b-000c29206271)]
interface nsIWebGLShader : nsISupports interface nsIWebGLShader : nsISupports
{ {
[noscript] attribute GLuint name; [noscript] attribute WebGLuint name;
}; };
[scriptable, uuid(beea4b38-3094-4e8d-b6e6-8b21d07e8994)] [scriptable, uuid(beea4b38-3094-4e8d-b6e6-8b21d07e8994)]
@ -113,20 +103,20 @@ interface nsIWebGLShaderArray : nsISupports
[scriptable, uuid(bce8be60-8305-11de-9f3c-000c29206271)] [scriptable, uuid(bce8be60-8305-11de-9f3c-000c29206271)]
interface nsIWebGLFramebuffer : nsISupports interface nsIWebGLFramebuffer : nsISupports
{ {
[noscript] attribute GLuint name; [noscript] attribute WebGLuint name;
}; };
[scriptable, uuid(c82eacd0-8305-11de-9de9-000c29206271)] [scriptable, uuid(c82eacd0-8305-11de-9de9-000c29206271)]
interface nsIWebGLRenderbuffer : nsISupports interface nsIWebGLRenderbuffer : nsISupports
{ {
[noscript] attribute GLuint name; [noscript] attribute WebGLuint name;
}; };
[scriptable, uuid(a85d4fd0-5b9f-4cb8-aeee-5a2c5c5bad76)] [scriptable, uuid(a85d4fd0-5b9f-4cb8-aeee-5a2c5c5bad76)]
interface nsIWebGLActiveInfo : nsISupports interface nsIWebGLActiveInfo : nsISupports
{ {
readonly attribute GLint size; readonly attribute WebGLint size;
readonly attribute GLenum type; readonly attribute WebGLenum type;
readonly attribute DOMString name; readonly attribute DOMString name;
}; };
@ -579,274 +569,266 @@ interface nsICanvasRenderingContextWebGL : nsISupports
// METHODS // METHODS
// //
void present(); void present();
long sizeInBytes(in GLenum type); long sizeInBytes(in WebGLenum type);
void activeTexture (in GLenum texture); void activeTexture(in WebGLenum texture);
void attachShader (in nsIWebGLProgram program, in nsIWebGLShader shader); void attachShader(in nsIWebGLProgram program, in nsIWebGLShader shader);
void bindAttribLocation (in nsIWebGLProgram program, in GLuint index, in DOMString name); void bindAttribLocation(in nsIWebGLProgram program, in WebGLuint index, in DOMString name);
void bindBuffer (in GLenum target, in nsIWebGLBuffer buffer); void bindBuffer(in WebGLenum target, in nsIWebGLBuffer buffer);
void bindFramebuffer (in GLenum target, in nsIWebGLFramebuffer framebuffer); void bindFramebuffer(in WebGLenum target, in nsIWebGLFramebuffer framebuffer);
void bindRenderbuffer (in GLenum target, in nsIWebGLRenderbuffer renderbuffer); void bindRenderbuffer(in WebGLenum target, in nsIWebGLRenderbuffer renderbuffer);
void bindTexture (in GLenum target, in nsIWebGLTexture texture); void bindTexture(in WebGLenum target, in nsIWebGLTexture texture);
void blendColor (in GLclampf red, in GLclampf green, in GLclampf blue, in GLclampf alpha); void blendColor(in WebGLclampf red, in WebGLclampf green, in WebGLclampf blue, in WebGLclampf alpha);
void blendEquation (in GLenum mode); void blendEquation(in WebGLenum mode);
void blendEquationSeparate (in GLenum modeRGB, in GLenum modeAlpha); void blendEquationSeparate(in WebGLenum modeRGB, in WebGLenum modeAlpha);
void blendFunc (in GLenum sfactor, in GLenum dfactor); void blendFunc(in WebGLenum sfactor, in WebGLenum dfactor);
void blendFuncSeparate (in GLenum srcRGB, in GLenum dstRGB, in GLenum srcAlpha, in GLenum dstAlpha); void blendFuncSeparate(in WebGLenum srcRGB, in WebGLenum dstRGB, in WebGLenum srcAlpha, in WebGLenum dstAlpha);
// Modified: void glBufferData (GLenum target, long size, const void* data, GLenum usage); // Modified: void glBufferData(WebGLenum target, long size, const void* data, WebGLenum usage);
void bufferData([optional] in long dummy); void bufferData([optional] in long dummy);
[noscript] void bufferData_size (in GLenum target, in GLsizei size, in GLenum usage); [noscript] void bufferData_size(in WebGLenum target, in WebGLsizei size, in WebGLenum usage);
[noscript] void bufferData_buf (in GLenum target, in WebGLArrayBufferPtr data, in GLenum usage); [noscript] void bufferData_buf(in WebGLenum target, in WebGLArrayBufferPtr data, in WebGLenum usage);
[noscript] void bufferData_array (in GLenum target, in WebGLArrayPtr data, in GLenum usage); [noscript] void bufferData_array(in WebGLenum target, in WebGLArrayPtr data, in WebGLenum usage);
void bufferSubData([optional] in long dummy); void bufferSubData([optional] in long dummy);
[noscript] void bufferSubData_buf (in GLenum target, in long offset, in WebGLArrayBufferPtr data); [noscript] void bufferSubData_buf(in WebGLenum target, in long offset, in WebGLArrayBufferPtr data);
[noscript] void bufferSubData_array (in GLenum target, in long offset, in WebGLArrayPtr data); [noscript] void bufferSubData_array(in WebGLenum target, in long offset, in WebGLArrayPtr data);
GLenum checkFramebufferStatus (in GLenum target); WebGLenum checkFramebufferStatus(in WebGLenum target);
void clear (in GLbitfield mask); void clear(in WebGLbitfield mask);
void clearColor (in GLclampf red, in GLclampf green, in GLclampf blue, in GLclampf alpha); void clearColor(in WebGLclampf red, in WebGLclampf green, in WebGLclampf blue, in WebGLclampf alpha);
void clearDepth (in GLclampf depth); void clearDepth(in WebGLclampf depth);
void clearStencil (in GLint s); void clearStencil(in WebGLint s);
void colorMask (in GLboolean red, in GLboolean green, in GLboolean blue, in GLboolean alpha); void colorMask(in WebGLboolean red, in WebGLboolean green, in WebGLboolean blue, in WebGLboolean alpha);
void compileShader (in nsIWebGLShader shader); void compileShader(in nsIWebGLShader shader);
void copyTexImage2D (in GLenum target, in GLint level, in GLenum internalformat, void copyTexImage2D(in WebGLenum target, in WebGLint level, in WebGLenum internalformat,
in GLint x, in GLint y, in GLsizei width, in GLsizei height, in GLint border); in WebGLint x, in WebGLint y, in WebGLsizei width, in WebGLsizei height, in WebGLint border);
void copyTexSubImage2D (in GLenum target, in GLint level, in GLint xoffset, in GLint yoffset, void copyTexSubImage2D(in WebGLenum target, in WebGLint level, in WebGLint xoffset, in WebGLint yoffset,
in GLint x, in GLint y, in GLsizei width, in GLsizei height); in WebGLint x, in WebGLint y, in WebGLsizei width, in WebGLsizei height);
nsIWebGLBuffer createBuffer(); nsIWebGLBuffer createBuffer();
nsIWebGLProgram createProgram (); nsIWebGLProgram createProgram();
nsIWebGLFramebuffer createFramebuffer(); nsIWebGLFramebuffer createFramebuffer();
nsIWebGLRenderbuffer createRenderbuffer(); nsIWebGLRenderbuffer createRenderbuffer();
nsIWebGLShader createShader (in GLenum type); nsIWebGLShader createShader(in WebGLenum type);
nsIWebGLTexture createTexture(); nsIWebGLTexture createTexture();
void cullFace (in GLenum mode); void cullFace(in WebGLenum mode);
void deleteBuffer (in nsIWebGLBuffer buffer); void deleteBuffer(in nsIWebGLBuffer buffer);
void deleteProgram (in nsIWebGLProgram program); void deleteProgram(in nsIWebGLProgram program);
void deleteFramebuffer (in nsIWebGLFramebuffer framebuffer); void deleteFramebuffer(in nsIWebGLFramebuffer framebuffer);
void deleteRenderbuffer (in nsIWebGLRenderbuffer renderbuffer); void deleteRenderbuffer(in nsIWebGLRenderbuffer renderbuffer);
void deleteShader (in nsIWebGLShader shader); void deleteShader(in nsIWebGLShader shader);
void deleteTexture (in nsIWebGLTexture texture); void deleteTexture(in nsIWebGLTexture texture);
void depthFunc (in GLenum func); void depthFunc(in WebGLenum func);
void depthMask (in GLboolean flag); void depthMask(in WebGLboolean flag);
void depthRange (in GLclampf zNear, in GLclampf zFar); void depthRange(in WebGLclampf zNear, in WebGLclampf zFar);
void detachShader (in nsIWebGLProgram program, in nsIWebGLShader shader); void detachShader(in nsIWebGLProgram program, in nsIWebGLShader shader);
void disable (in GLenum cap); void disable(in WebGLenum cap);
void disableVertexAttribArray (in GLuint index); void disableVertexAttribArray(in WebGLuint index);
void drawArrays (in GLenum mode, in GLint first, in GLsizei count); void drawArrays(in WebGLenum mode, in WebGLint first, in WebGLsizei count);
// Modified: void glDrawElements (GLenum mode, GLsizei count, GLenum type, const void* indices); // Modified: void glDrawElements(WebGLenum mode, WebGLsizei count, WebGLenum type, const void* indices);
void drawElements (in GLenum mode, in GLuint count, in GLenum type, in GLuint offset); void drawElements(in WebGLenum mode, in WebGLuint count, in WebGLenum type, in WebGLuint offset);
void enable (in GLenum cap); void enable(in WebGLenum cap);
void enableVertexAttribArray (in GLuint index); void enableVertexAttribArray(in WebGLuint index);
void finish (); void finish();
void flush (); void flush();
void framebufferRenderbuffer (in GLenum target, in GLenum attachment, in GLenum renderbuffertarget, void framebufferRenderbuffer(in WebGLenum target, in WebGLenum attachment, in WebGLenum renderbuffertarget,
in nsIWebGLRenderbuffer renderbuffer); in nsIWebGLRenderbuffer renderbuffer);
void framebufferTexture2D (in GLenum target, in GLenum attachment, in GLenum textarget, void framebufferTexture2D(in WebGLenum target, in WebGLenum attachment, in WebGLenum textarget,
in nsIWebGLTexture texture, in GLint level); in nsIWebGLTexture texture, in WebGLint level);
void frontFace (in GLenum mode); void frontFace(in WebGLenum mode);
void generateMipmap (in GLenum target); void generateMipmap(in WebGLenum target);
nsIWebGLActiveInfo getActiveAttrib(in nsIWebGLProgram program, in PRUint32 index); nsIWebGLActiveInfo getActiveAttrib(in nsIWebGLProgram program, in PRUint32 index);
nsIWebGLActiveInfo getActiveUniform(in nsIWebGLProgram program, in PRUint32 index); nsIWebGLActiveInfo getActiveUniform(in nsIWebGLProgram program, in PRUint32 index);
// TBD // TBD
// void glGetAttachedShaders (GLuint program, GLsizei maxcount, GLsizei* count, GLuint* shaders); // void glGetAttachedShaders(WebGLuint program, WebGLsizei maxcount, WebGLsizei* count, WebGLuint* shaders);
//nsIWebGLShaderArray glGetAttachedShaders(in GLuint program); //nsIWebGLShaderArray glGetAttachedShaders(in WebGLuint program);
GLint getAttribLocation (in nsIWebGLProgram program, in DOMString name); WebGLint getAttribLocation(in nsIWebGLProgram program, in DOMString name);
// Modified void getParameter(in WebGLenum pname);
//GLboolean getBoolean(in GLenum pname);
// NOTYET nsIWebGLBooleanArray getBooleanv(in GLenum pname);
//GLfloat getFloat(in GLenum pname);
//nsIWebGLArray getFloatv(in GLenum pname);
//GLint getInteger(in GLenum pname);
//nsIWebGLIntArray getIntegerv(in GLenum pname);
// js only
void getParameter (in GLenum pname);
// Modified: void glGetBufferParameteriv (GLenum target, GLenum pname, GLint* params); // Modified: void glGetBufferParameteriv(WebGLenum target, WebGLenum pname, WebGLint* params);
void getBufferParameter (in GLenum target, in GLenum pname); void getBufferParameter(in WebGLenum target, in WebGLenum pname);
GLenum getError (); WebGLenum getError();
// Modified: void glGetFramebufferAttachmentParameteriv (GLenum target, GLenum attachment, GLenum pname, GLint* params); // Modified: void glGetFramebufferAttachmentParameteriv(WebGLenum target, WebGLenum attachment, WebGLenum pname, WebGLint* params);
void getFramebufferAttachmentParameter (in GLenum target, in GLenum attachment, in GLenum pname); void getFramebufferAttachmentParameter(in WebGLenum target, in WebGLenum attachment, in WebGLenum pname);
// Modified: void glGetProgramiv (nsIWebGLProgram program, GLenum pname, GLint* params); // Modified: void glGetProgramiv(nsIWebGLProgram program, WebGLenum pname, WebGLint* params);
void getProgramParameter (in nsIWebGLProgram program, in GLenum pname); void getProgramParameter(in nsIWebGLProgram program, in WebGLenum pname);
// Modified: void glGetProgramInfoLog (GLuint program, GLsizei bufsize, GLsizei* length, char* infolog); // Modified: void glGetProgramInfoLog(WebGLuint program, WebGLsizei bufsize, WebGLsizei* length, char* infolog);
DOMString getProgramInfoLog (in nsIWebGLProgram program); DOMString getProgramInfoLog(in nsIWebGLProgram program);
// Modified: void glGetRenderbufferParameteriv (GLenum target, GLenum pname, GLint* params); // Modified: void glGetRenderbufferParameteriv(WebGLenum target, WebGLenum pname, WebGLint* params);
//nsIWebGLIntArray getRenderbufferParameteriv (in GLenum target, in GLenum pname); //nsIWebGLIntArray getRenderbufferParameteriv(in WebGLenum target, in WebGLenum pname);
void getRenderbufferParameter (in GLenum target, in GLenum pname); void getRenderbufferParameter(in WebGLenum target, in WebGLenum pname);
void getShaderParameter (in nsIWebGLShader shader, in GLenum pname); void getShaderParameter(in nsIWebGLShader shader, in WebGLenum pname);
// Modified: void glGetShaderInfoLog (GLuint shader, GLsizei bufsize, GLsizei* length, char* infolog); // Modified: void glGetShaderInfoLog(WebGLuint shader, WebGLsizei bufsize, WebGLsizei* length, char* infolog);
DOMString getShaderInfoLog (in nsIWebGLShader shader); DOMString getShaderInfoLog(in nsIWebGLShader shader);
// TBD // TBD
//void glGetShaderPrecisionFormat (GLenum shadertype, GLenum precisiontype, GLint* range, GLint* precision); //void glGetShaderPrecisionFormat(WebGLenum shadertype, WebGLenum precisiontype, WebGLint* range, WebGLint* precision);
DOMString getShaderSource (in nsIWebGLShader shader); DOMString getShaderSource(in nsIWebGLShader shader);
DOMString getString (in GLenum name); DOMString getString(in WebGLenum name);
void getTexParameter (in GLenum target, in GLenum pname); void getTexParameter(in WebGLenum target, in WebGLenum pname);
// FIXME: This is problematic. We don't implicitly know how big the returned data buffer // FIXME: This is problematic. We don't implicitly know how big the returned data buffer
// needs to be like in the other glGet* calls. The only way to find out is to iterate // needs to be like in the other glGet* calls. The only way to find out is to iterate
// through all the active uniforms with glGetActiveUniform() looking for the corresponding // through all the active uniforms with glGetActiveUniform() looking for the corresponding
// 'location'. This will give us the type and size of the data. Since this is a get call // 'location'. This will give us the type and size of the data. Since this is a get call
// maybe that's ok? // maybe that's ok?
void getUniform (in nsIWebGLProgram program, in GLint location); void getUniform(in nsIWebGLProgram program, in WebGLint location);
GLint getUniformLocation (in nsIWebGLProgram program, in DOMString name); WebGLint getUniformLocation(in nsIWebGLProgram program, in DOMString name);
void getVertexAttrib (in GLuint index, in GLenum pname); void getVertexAttrib(in WebGLuint index, in WebGLenum pname);
// TBD // TBD
// void glGetVertexAttribPointerv (GLuint index, GLenum pname, void** pointer); // void glGetVertexAttribPointerv(WebGLuint index, WebGLenum pname, void** pointer);
GLuint getVertexAttribOffset(in GLuint index, in GLenum pname); WebGLuint getVertexAttribOffset(in WebGLuint index, in WebGLenum pname);
void hint (in GLenum target, in GLenum mode); void hint(in WebGLenum target, in WebGLenum mode);
GLboolean isBuffer (in nsIWebGLBuffer buffer); WebGLboolean isBuffer(in nsIWebGLBuffer buffer);
GLboolean isFramebuffer (in nsIWebGLFramebuffer framebuffer); WebGLboolean isFramebuffer(in nsIWebGLFramebuffer framebuffer);
GLboolean isProgram (in nsIWebGLProgram program); WebGLboolean isProgram(in nsIWebGLProgram program);
GLboolean isRenderbuffer (in nsIWebGLRenderbuffer renderbuffer); WebGLboolean isRenderbuffer(in nsIWebGLRenderbuffer renderbuffer);
GLboolean isShader (in nsIWebGLShader shader); WebGLboolean isShader(in nsIWebGLShader shader);
GLboolean isTexture (in nsIWebGLTexture texture); WebGLboolean isTexture(in nsIWebGLTexture texture);
GLboolean isEnabled (in GLenum cap); WebGLboolean isEnabled(in WebGLenum cap);
void lineWidth (in GLfloat width); void lineWidth(in WebGLfloat width);
void linkProgram (in nsIWebGLProgram program); void linkProgram(in nsIWebGLProgram program);
void pixelStorei (in GLenum pname, in GLint param); void pixelStorei(in WebGLenum pname, in WebGLint param);
void polygonOffset (in GLfloat factor, in GLfloat units); void polygonOffset(in WebGLfloat factor, in WebGLfloat units);
// TBD // TBD
//ZZ void glReadPixels (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, void* pixels); //ZZ void glReadPixels(WebGLint x, WebGLint y, WebGLsizei width, WebGLsizei height, WebGLenum format, WebGLenum type, void* pixels);
void readPixels (in GLint x, in GLint y, in GLsizei width, in GLsizei height, in GLenum format, in GLenum type); void readPixels(in WebGLint x, in WebGLint y, in WebGLsizei width, in WebGLsizei height, in WebGLenum format, in WebGLenum type);
//void glReleaseShaderCompiler (); //void glReleaseShaderCompiler();
void renderbufferStorage (in GLenum target, in GLenum internalformat, in GLsizei width, in GLsizei height); void renderbufferStorage(in WebGLenum target, in WebGLenum internalformat, in WebGLsizei width, in WebGLsizei height);
void sampleCoverage (in GLclampf value, in GLboolean invert); void sampleCoverage(in WebGLclampf value, in WebGLboolean invert);
void scissor (in GLint x, in GLint y, in GLsizei width, in GLsizei height); void scissor(in WebGLint x, in WebGLint y, in WebGLsizei width, in WebGLsizei height);
// Modified: void glShaderSource (GLuint shader, GLsizei count, const char** string, const GLint* length); // Modified: void glShaderSource(WebGLuint shader, WebGLsizei count, const char** string, const WebGLint* length);
void shaderSource (in nsIWebGLShader shader, in DOMString source); void shaderSource(in nsIWebGLShader shader, in DOMString source);
void stencilFunc (in GLenum func, in GLint ref, in GLuint mask); void stencilFunc(in WebGLenum func, in WebGLint ref, in WebGLuint mask);
void stencilFuncSeparate (in GLenum face, in GLenum func, in GLint ref, in GLuint mask); void stencilFuncSeparate(in WebGLenum face, in WebGLenum func, in WebGLint ref, in WebGLuint mask);
void stencilMask (in GLuint mask); void stencilMask(in WebGLuint mask);
void stencilMaskSeparate (in GLenum face, in GLuint mask); void stencilMaskSeparate(in WebGLenum face, in WebGLuint mask);
void stencilOp (in GLenum fail, in GLenum zfail, in GLenum zpass); void stencilOp(in WebGLenum fail, in WebGLenum zfail, in WebGLenum zpass);
void stencilOpSeparate (in GLenum face, in GLenum fail, in GLenum zfail, in GLenum zpass); void stencilOpSeparate(in WebGLenum face, in WebGLenum fail, in WebGLenum zfail, in WebGLenum zpass);
void texImage2D([optional] in long dummy); void texImage2D([optional] in long dummy);
[noscript] void texImage2D_buf (in GLenum target, in GLint level, in GLenum internalformat, [noscript] void texImage2D_buf(in WebGLenum target, in WebGLint level, in WebGLenum internalformat,
in GLsizei width, in GLsizei height, in WebGLsizei width, in WebGLsizei height,
in GLint border, in GLenum format, in GLenum type, in WebGLArrayBufferPtr pixels); in WebGLint border, in WebGLenum format, in WebGLenum type, in WebGLArrayBufferPtr pixels);
[noscript] void texImage2D_array (in GLenum target, in GLint level, in GLenum internalformat, [noscript] void texImage2D_array(in WebGLenum target, in WebGLint level, in WebGLenum internalformat,
in GLsizei width, in GLsizei height, in WebGLsizei width, in WebGLsizei height,
in GLint border, in GLenum format, in GLenum type, in WebGLArrayPtr pixels); in WebGLint border, in WebGLenum format, in WebGLenum type, in WebGLArrayPtr pixels);
// HTMLImageElement, HTMLCanvasElement, HTMLVideoElement // HTMLImageElement, HTMLCanvasElement, HTMLVideoElement
[noscript] void texImage2D_dom (in GLenum target, in GLint level, in nsIDOMElement element, [noscript] void texImage2D_dom(in WebGLenum target, in WebGLint level, in nsIDOMElement element,
[optional] in GLboolean premultiply, [optional] in GLboolean asPremultipliedAlpha); [optional] in WebGLboolean premultiply, [optional] in WebGLboolean asPremultipliedAlpha);
void texSubImage2D([optional] in long dummy); void texSubImage2D([optional] in long dummy);
[noscript] void texSubImage2D_buf (in GLenum target, in GLint level, [noscript] void texSubImage2D_buf(in WebGLenum target, in WebGLint level,
in GLint xoffset, in GLint yoffset, in GLsizei width, in GLsizei height, in WebGLint xoffset, in WebGLint yoffset, in WebGLsizei width, in WebGLsizei height,
in GLenum format, in GLenum type, in WebGLArrayBufferPtr pixels); in WebGLenum format, in WebGLenum type, in WebGLArrayBufferPtr pixels);
[noscript] void texSubImage2D_array (in GLenum target, in GLint level, [noscript] void texSubImage2D_array(in WebGLenum target, in WebGLint level,
in GLint xoffset, in GLint yoffset, in GLsizei width, in GLsizei height, in WebGLint xoffset, in WebGLint yoffset, in WebGLsizei width, in WebGLsizei height,
in GLenum format, in GLenum type, in WebGLArrayPtr pixels); in WebGLenum format, in WebGLenum type, in WebGLArrayPtr pixels);
// HTMLImageElement, HTMLCanvasElement, HTMLVideoElement // HTMLImageElement, HTMLCanvasElement, HTMLVideoElement
[noscript] void texSubImage2D_dom (in GLenum target, in GLint level, [noscript] void texSubImage2D_dom(in WebGLenum target, in WebGLint level,
in GLint xoffset, in GLint yoffset, in GLsizei width, in GLsizei height, in WebGLint xoffset, in WebGLint yoffset, in WebGLsizei width, in WebGLsizei height,
in nsIDOMElement element, in nsIDOMElement element,
[optional] in GLboolean premultiply, [optional] in GLboolean asPremultipliedAlpha); [optional] in WebGLboolean premultiply, [optional] in WebGLboolean asPremultipliedAlpha);
// Modified: This replaces glTexParameterf, glTexParameterfv, glTexParameteri and glTexParameteriv // Modified: This replaces glTexParameterf, glTexParameterfv, glTexParameteri and glTexParameteriv
void texParameterf (in GLenum target, in GLenum pname, in GLfloat param); void texParameterf(in WebGLenum target, in WebGLenum pname, in WebGLfloat param);
void texParameteri (in GLenum target, in GLenum pname, in GLint param); void texParameteri(in WebGLenum target, in WebGLenum pname, in WebGLint param);
//void glTexParameter (in GLenum target, in GLenum pname, in nsIWebGLArray params); //void glTexParameter(in WebGLenum target, in WebGLenum pname, in nsIWebGLArray params);
// Modified: All the glUniform*v forms below are modified by replacing 'count' and 'v' with a nsIWebGLArray // Modified: All the glUniform*v forms below are modified by replacing 'count' and 'v' with a nsIWebGLArray
void uniform1f (in GLint location, in GLfloat x); void uniform1f(in WebGLint location, in WebGLfloat x);
void uniform1i (in GLint location, in GLint x); void uniform1i(in WebGLint location, in WebGLint x);
void uniform2f (in GLint location, in GLfloat x, in GLfloat y); void uniform2f(in WebGLint location, in WebGLfloat x, in WebGLfloat y);
void uniform2i (in GLint location, in GLint x, in GLint y); void uniform2i(in WebGLint location, in WebGLint x, in WebGLint y);
void uniform3f (in GLint location, in GLfloat x, in GLfloat y, in GLfloat z); void uniform3f(in WebGLint location, in WebGLfloat x, in WebGLfloat y, in WebGLfloat z);
void uniform3i (in GLint location, in GLint x, in GLint y, in GLint z); void uniform3i(in WebGLint location, in WebGLint x, in WebGLint y, in WebGLint z);
void uniform4f (in GLint location, in GLfloat x, in GLfloat y, in GLfloat z, in GLfloat w); void uniform4f(in WebGLint location, in WebGLfloat x, in WebGLfloat y, in WebGLfloat z, in WebGLfloat w);
void uniform4i (in GLint location, in GLint x, in GLint y, in GLint z, in GLint w); void uniform4i(in WebGLint location, in WebGLint x, in WebGLint y, in WebGLint z, in WebGLint w);
void uniform1fv ([optional] in long dummy); void uniform1fv([optional] in long dummy);
void uniform1iv ([optional] in long dummy); void uniform1iv([optional] in long dummy);
void uniform2fv ([optional] in long dummy); void uniform2fv([optional] in long dummy);
void uniform2iv ([optional] in long dummy); void uniform2iv([optional] in long dummy);
void uniform3fv ([optional] in long dummy); void uniform3fv([optional] in long dummy);
void uniform3iv ([optional] in long dummy); void uniform3iv([optional] in long dummy);
void uniform4fv ([optional] in long dummy); void uniform4fv([optional] in long dummy);
void uniform4iv ([optional] in long dummy); void uniform4iv([optional] in long dummy);
[noscript] void uniform1fv_array (in GLint location, in WebGLArrayPtr v); [noscript] void uniform1fv_array(in WebGLint location, in WebGLArrayPtr v);
[noscript] void uniform1iv_array (in GLint location, in WebGLArrayPtr v); [noscript] void uniform1iv_array(in WebGLint location, in WebGLArrayPtr v);
[noscript] void uniform2fv_array (in GLint location, in WebGLArrayPtr v); [noscript] void uniform2fv_array(in WebGLint location, in WebGLArrayPtr v);
[noscript] void uniform2iv_array (in GLint location, in WebGLArrayPtr v); [noscript] void uniform2iv_array(in WebGLint location, in WebGLArrayPtr v);
[noscript] void uniform3fv_array (in GLint location, in WebGLArrayPtr v); [noscript] void uniform3fv_array(in WebGLint location, in WebGLArrayPtr v);
[noscript] void uniform3iv_array (in GLint location, in WebGLArrayPtr v); [noscript] void uniform3iv_array(in WebGLint location, in WebGLArrayPtr v);
[noscript] void uniform4fv_array (in GLint location, in WebGLArrayPtr v); [noscript] void uniform4fv_array(in WebGLint location, in WebGLArrayPtr v);
[noscript] void uniform4iv_array (in GLint location, in WebGLArrayPtr v); [noscript] void uniform4iv_array(in WebGLint location, in WebGLArrayPtr v);
// Modified. These are modified by replacing 'count' and 'value' with a WebGLArrayPtr // Modified. These are modified by replacing 'count' and 'value' with a WebGLArrayPtr
void uniformMatrix2fv ([optional] in long dummy); void uniformMatrix2fv([optional] in long dummy);
void uniformMatrix3fv ([optional] in long dummy); void uniformMatrix3fv([optional] in long dummy);
void uniformMatrix4fv ([optional] in long dummy); void uniformMatrix4fv([optional] in long dummy);
[noscript] void uniformMatrix2fv_array (in GLint location, in GLboolean transpose, in WebGLArrayPtr value); [noscript] void uniformMatrix2fv_array(in WebGLint location, in WebGLboolean transpose, in WebGLArrayPtr value);
[noscript] void uniformMatrix3fv_array (in GLint location, in GLboolean transpose, in WebGLArrayPtr value); [noscript] void uniformMatrix3fv_array(in WebGLint location, in WebGLboolean transpose, in WebGLArrayPtr value);
[noscript] void uniformMatrix4fv_array (in GLint location, in GLboolean transpose, in WebGLArrayPtr value); [noscript] void uniformMatrix4fv_array(in WebGLint location, in WebGLboolean transpose, in WebGLArrayPtr value);
// Added API using top entry from the passed nsIWebGLMatrixStack // Added API using top entry from the passed nsIWebGLMatrixStack
//ZZ void glUniformMatrix (in GLint location, in GLboolean transpose, in nsIWebGLMatrixStack value); //ZZ void glUniformMatrix(in WebGLint location, in WebGLboolean transpose, in nsIWebGLMatrixStack value);
void useProgram (in nsIWebGLProgram program); void useProgram(in nsIWebGLProgram program);
void validateProgram (in nsIWebGLProgram program); void validateProgram(in nsIWebGLProgram program);
// Modified: All the glVertexAttrib*v forms below are modified by replacing 'values' with a WebGLArrayPtr // Modified: All the glVertexAttrib*v forms below are modified by replacing 'values' with a WebGLArrayPtr
void vertexAttrib1f (in GLuint indx, in GLfloat x); void vertexAttrib1f(in WebGLuint indx, in WebGLfloat x);
void vertexAttrib2f (in GLuint indx, in GLfloat x, in GLfloat y); void vertexAttrib2f(in WebGLuint indx, in WebGLfloat x, in WebGLfloat y);
void vertexAttrib3f (in GLuint indx, in GLfloat x, in GLfloat y, in GLfloat z); void vertexAttrib3f(in WebGLuint indx, in WebGLfloat x, in WebGLfloat y, in WebGLfloat z);
void vertexAttrib4f (in GLuint indx, in GLfloat x, in GLfloat y, in GLfloat z, in GLfloat w); void vertexAttrib4f(in WebGLuint indx, in WebGLfloat x, in WebGLfloat y, in WebGLfloat z, in WebGLfloat w);
void vertexAttrib1fv ([optional] in long dummy); void vertexAttrib1fv([optional] in long dummy);
void vertexAttrib2fv ([optional] in long dummy); void vertexAttrib2fv([optional] in long dummy);
void vertexAttrib3fv ([optional] in long dummy); void vertexAttrib3fv([optional] in long dummy);
void vertexAttrib4fv ([optional] in long dummy); void vertexAttrib4fv([optional] in long dummy);
[noscript] void vertexAttrib1fv_array (in GLuint indx, in WebGLArrayPtr values); [noscript] void vertexAttrib1fv_array(in WebGLuint indx, in WebGLArrayPtr values);
[noscript] void vertexAttrib2fv_array (in GLuint indx, in WebGLArrayPtr values); [noscript] void vertexAttrib2fv_array(in WebGLuint indx, in WebGLArrayPtr values);
[noscript] void vertexAttrib3fv_array (in GLuint indx, in WebGLArrayPtr values); [noscript] void vertexAttrib3fv_array(in WebGLuint indx, in WebGLArrayPtr values);
[noscript] void vertexAttrib4fv_array (in GLuint indx, in WebGLArrayPtr values); [noscript] void vertexAttrib4fv_array(in WebGLuint indx, in WebGLArrayPtr values);
// size is number of elements per attrib; offset, stride are in bytes // size is number of elements per attrib; offset, stride are in bytes
void vertexAttribPointer (in GLuint idx, in GLint size, in GLenum type, in GLboolean normalized, in GLuint stride, in GLuint offset); void vertexAttribPointer(in WebGLuint idx, in WebGLint size, in WebGLenum type, in WebGLboolean normalized, in WebGLuint stride, in WebGLuint offset);
void viewport (in GLint x, in GLint y, in GLsizei width, in GLsizei height); void viewport(in WebGLint x, in WebGLint y, in WebGLsizei width, in WebGLsizei height);
}; };

2
js/src/xpconnect/src/qsgen.py
Просмотреть файл

@ -1003,6 +1003,8 @@ traceReturnTypeMap = {
["jsdouble ", "DOUBLE", "0"], ["jsdouble ", "DOUBLE", "0"],
'double': 'double':
["jsdouble ", "DOUBLE", "0"], ["jsdouble ", "DOUBLE", "0"],
'octet':
["uint32 ", "UINT32", "0"]
} }
# This list extends the above list, but includes types that # This list extends the above list, but includes types that