wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

b=571076; Implement GetAttachedShaders; r=vladimir

Browse Source
This commit is contained in:
Benoit Jacob 2010-06-15 11:49:34 -04:00
parent b78c78cd73
commit f0a49876fe
3 changed files with 29 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
content/canvas/src/WebGLContext.h
View File

@ -668,6 +668,7 @@ public:
PRBool Deleted() { return mDeleted; }
WebGLuint GLName() { return mName; }
const nsTArray<WebGLShader*>& AttachedShaders() const { return mAttachedShaders; }
PRBool LinkStatus() { return mLinkStatus; }
GLuint Generation() const { return mGeneration; }
void SetLinkStatus(PRBool val) { mLinkStatus = val; }

62
content/canvas/src/WebGLContextGL.cpp
View File

@ -1106,48 +1106,37 @@ WebGLContext::GetActiveUniform(nsIWebGLProgram *pobj, PRUint32 index, nsIWebGLAc
return NS_OK;
}
// XXX fixme to return a IntArray
#if 0
NS_IMETHODIMP
WebGLContext::GetAttachedShaders(nsIWebGLProgram *pobj)
WebGLContext::GetAttachedShaders(nsIWebGLProgram *pobj, nsIVariant **retval)
{
nsresult rv;
nsCOMPtr<WebGLProgram> prog = do_QueryInterface(pobj, &rv);
if (NS_FAILED(rv))
return NS_ERROR_DOM_SYNTAX_ERR;
WebGLProgram *prog;
if (!GetConcreteObject(pobj, &prog))
return ErrorInvalidOperation("GetActiveAttrib: invalid program");
if (!prog || static_cast<WebGLProgram*>(prog)->Deleted())
return ErrorInvalidOperation("%s: program is null or deleted!", __FUNCTION__);
WebGLuint program = static_cast<WebGLProgram*>(prog)->GLName();
NativeJSContext js;
if (NS_FAILED(js.error))
return js.error;
nsCOMPtr<nsIWritableVariant> wrval = do_CreateInstance("@mozilla.org/variant;1");
NS_ENSURE_TRUE(wrval, NS_ERROR_FAILURE);
MakeContextCurrent();
GLint count = 0;
gl->fGetProgramiv(program, LOCAL_GL_ATTACHED_SHADERS, &count);
if (count == 0) {
JSObject *empty = JS_NewArrayObject(js.ctx, 0, NULL);
js.SetRetVal(empty);
return NS_OK;
if (prog->AttachedShaders().Length() == 0) {
wrval->SetAsEmptyArray();
}
else {
wrval->SetAsArray(nsIDataType::VTYPE_INTERFACE,
&NS_GET_IID(nsIWebGLShader),
prog->AttachedShaders().Length(),
const_cast<void*>( // @#$% SetAsArray doesn't accept a const void*
static_cast<const void*>(
prog->AttachedShaders().Elements()
)
)
);
}
nsAutoArrayPtr<PRUint32> shaders(new PRUint32[count]);
gl->fGetAttachedShaders(program, count, NULL, (WebGLuint*) shaders.get());
JSObject *obj = NativeJSContext::ArrayToJSArray(js.ctx, shaders, count);
js.AddGCRoot(obj, "GetAttachedShaders");
js.SetRetVal(obj);
js.ReleaseGCRoot(obj);
*retval = wrval.forget().get();
return NS_OK;
}
#endif
NS_IMETHODIMP
WebGLContext::GetAttribLocation(nsIWebGLProgram *pobj,
@ -2014,14 +2003,17 @@ WebGLContext::LinkProgram(nsIWebGLProgram *pobj)
if (!GetConcreteObjectAndGLName(pobj, &program, &progname))
return ErrorInvalidOperation("LinkProgram: invalid program");
if (!program->HasBothShaderTypesAttached())
return ErrorInvalidOperation("LinkProgram: program does not have at least one vertex and fragment shader attached");
if (!program->NextGeneration())
return NS_ERROR_FAILURE;
if (!program->HasBothShaderTypesAttached()) {
program->SetLinkStatus(PR_FALSE);
return NS_OK;
}
MakeContextCurrent();
gl->fLinkProgram(progname);
if (!program->NextGeneration())
return NS_ERROR_FAILURE;
GLint ok;
gl->fGetProgramiv(progname, LOCAL_GL_LINK_STATUS, &ok);

4
dom/interfaces/canvas/nsICanvasRenderingContextWebGL.idl
View File

@ -656,9 +656,7 @@ interface nsICanvasRenderingContextWebGL : nsISupports
nsIWebGLActiveInfo getActiveAttrib(in nsIWebGLProgram program, in PRUint32 index);
nsIWebGLActiveInfo getActiveUniform(in nsIWebGLProgram program, in PRUint32 index);
// TBD
// void glGetAttachedShaders(WebGLuint program, WebGLsizei maxcount, WebGLsizei* count, WebGLuint* shaders);
//nsIWebGLShaderArray glGetAttachedShaders(in WebGLuint program);
nsIVariant getAttachedShaders(in nsIWebGLProgram program);
WebGLint getAttribLocation(in nsIWebGLProgram program, in DOMString name);