Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-12 04:45:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 615013 - Implement section 6.8 on mutually incompatible blend factors - r=vlad

Browse Source
This commit is contained in:
Benoit Jacob 2010-12-06 06:34:35 -05:00
parent 70d338d645
commit b70f21df24
3 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -422,9 +422,10 @@ protected:
PRBool InitAndValidateGL();
PRBool ValidateBuffers(PRUint32 count);
PRBool ValidateCapabilityEnum(WebGLenum cap, const char *info);
PRBool ValidateBlendEquationEnum(WebGLuint cap, const char *info);
PRBool ValidateBlendFuncDstEnum(WebGLuint mode, const char *info);
PRBool ValidateBlendFuncSrcEnum(WebGLuint mode, const char *info);
PRBool ValidateBlendEquationEnum(WebGLenum cap, const char *info);
PRBool ValidateBlendFuncDstEnum(WebGLenum mode, const char *info);
PRBool ValidateBlendFuncSrcEnum(WebGLenum mode, const char *info);
PRBool ValidateBlendFuncEnumsCompatibility(WebGLenum sfactor, WebGLenum dfactor, const char *info);
PRBool ValidateTextureTargetEnum(WebGLenum target, const char *info);
PRBool ValidateComparisonEnum(WebGLenum target, const char *info);
PRBool ValidateStencilOpEnum(WebGLenum action, const char *info);

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

@ -324,6 +324,9 @@ NS_IMETHODIMP WebGLContext::BlendFunc(WebGLenum sfactor, WebGLenum dfactor)
!ValidateBlendFuncDstEnum(dfactor, "blendFunc: dfactor"))
return NS_OK;
if (!ValidateBlendFuncEnumsCompatibility(sfactor, dfactor, "blendFuncSeparate: srcRGB and dstRGB"))
return NS_OK;
MakeContextCurrent();
gl->fBlendFunc(sfactor, dfactor);
return NS_OK;
@ -339,6 +342,11 @@ WebGLContext::BlendFuncSeparate(WebGLenum srcRGB, WebGLenum dstRGB,
!ValidateBlendFuncDstEnum(dstAlpha, "blendFuncSeparate: dstAlpha"))
return NS_OK;
// note that we only check compatibity for the RGB enums, no need to for the Alpha enums, see
// "Section 6.8 forgetting to mention alpha factors?" thread on the public_webgl mailing list
if (!ValidateBlendFuncEnumsCompatibility(srcRGB, dstRGB, "blendFuncSeparate: srcRGB and dstRGB"))
return NS_OK;
MakeContextCurrent();
gl->fBlendFuncSeparate(srcRGB, dstRGB, srcAlpha, dstAlpha);
return NS_OK;

19
content/canvas/src/WebGLContextValidate.cpp
View File

@ -204,6 +204,25 @@ PRBool WebGLContext::ValidateBlendFuncSrcEnum(WebGLenum factor, const char *info
return ValidateBlendFuncDstEnum(factor, info);
}
PRBool WebGLContext::ValidateBlendFuncEnumsCompatibility(WebGLenum sfactor, WebGLenum dfactor, const char *info)
{
PRBool sfactorIsConstantColor = sfactor == LOCAL_GL_CONSTANT_COLOR ||
sfactor == LOCAL_GL_ONE_MINUS_CONSTANT_COLOR;
PRBool sfactorIsConstantAlpha = sfactor == LOCAL_GL_CONSTANT_ALPHA ||
sfactor == LOCAL_GL_ONE_MINUS_CONSTANT_ALPHA;
PRBool dfactorIsConstantColor = dfactor == LOCAL_GL_CONSTANT_COLOR ||
dfactor == LOCAL_GL_ONE_MINUS_CONSTANT_COLOR;
PRBool dfactorIsConstantAlpha = dfactor == LOCAL_GL_CONSTANT_ALPHA ||
dfactor == LOCAL_GL_ONE_MINUS_CONSTANT_ALPHA;
if ( (sfactorIsConstantColor && dfactorIsConstantAlpha) ||
(dfactorIsConstantColor && sfactorIsConstantAlpha) ) {
ErrorInvalidOperation("%s are mutually incompatible, see section 6.8 in the WebGL 1.0 spec", info);
return PR_FALSE;
} else {
return PR_TRUE;
}
}
PRBool WebGLContext::ValidateTextureTargetEnum(WebGLenum target, const char *info)
{
switch (target) {