зеркало из https://github.com/mozilla/gecko-dev.git
b=523286; [webgl] fix webgl framebuffer attachment test and misc error type; r=bjacob, a=b
This commit is contained in:
Родитель
d3d92c83a3
Коммит
121bdeae86
|
@ -1377,8 +1377,9 @@ NS_DEFINE_STATIC_IID_ACCESSOR(WebGLRenderbuffer, WEBGLRENDERBUFFER_PRIVATE_IID)
|
||||||
|
|
||||||
class WebGLFramebufferAttachment
|
class WebGLFramebufferAttachment
|
||||||
{
|
{
|
||||||
nsRefPtr<WebGLTexture> mTexturePtr;
|
// deleting a texture or renderbuffer immediately detaches it
|
||||||
nsRefPtr<WebGLRenderbuffer> mRenderbufferPtr;
|
WebGLObjectRefPtr<WebGLTexture> mTexturePtr;
|
||||||
|
WebGLObjectRefPtr<WebGLRenderbuffer> mRenderbufferPtr;
|
||||||
WebGLenum mAttachmentPoint;
|
WebGLenum mAttachmentPoint;
|
||||||
WebGLint mTextureLevel;
|
WebGLint mTextureLevel;
|
||||||
WebGLenum mTextureCubeMapFace;
|
WebGLenum mTextureCubeMapFace;
|
||||||
|
|
|
@ -2189,7 +2189,7 @@ WebGLContext::GetUniform(nsIWebGLProgram *pobj, nsIWebGLUniformLocation *ploc, n
|
||||||
return ErrorInvalidValue("GetUniform: this uniform location corresponds to another program");
|
return ErrorInvalidValue("GetUniform: this uniform location corresponds to another program");
|
||||||
|
|
||||||
if (location->ProgramGeneration() != prog->Generation())
|
if (location->ProgramGeneration() != prog->Generation())
|
||||||
return ErrorInvalidValue("GetUniform: this uniform location is obsolete since the program has been relinked");
|
return ErrorInvalidOperation("GetUniform: this uniform location is obsolete since the program has been relinked");
|
||||||
|
|
||||||
nsCOMPtr<nsIWritableVariant> wrval = do_CreateInstance("@mozilla.org/variant;1");
|
nsCOMPtr<nsIWritableVariant> wrval = do_CreateInstance("@mozilla.org/variant;1");
|
||||||
NS_ENSURE_TRUE(wrval, NS_ERROR_FAILURE);
|
NS_ENSURE_TRUE(wrval, NS_ERROR_FAILURE);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче