Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-03 12:35:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1286768 - Fix num used attrib locations for matrix types. - r=mtseng

Browse Source 
MozReview-Commit-ID: 71v2R1cj0aC
This commit is contained in:
Jeff Gilbert 2016-07-14 00:35:56 -07:00
parent 394908cfe7
commit e40bdbb8df
3 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dom/canvas/WebGLActiveInfo.cpp
View File

@ -9,7 +9,7 @@
namespace mozilla {
uint8_t
static uint8_t
ElemSizeFromType(GLenum elemType)
{
switch (elemType) {

1
dom/canvas/WebGLActiveInfo.h
View File

@ -91,7 +91,6 @@ private:
//////////
uint8_t ElemSizeFromType(GLenum elemType);
bool IsElemTypeSampler(GLenum elemType);
} // namespace mozilla

32
dom/canvas/WebGLProgram.cpp
View File

@ -1046,6 +1046,32 @@ WebGLProgram::LinkProgram()
}
}
static uint8_t
NumUsedLocationsByElemType(GLenum elemType)
{
// GLES 3.0.4 p55
switch (elemType) {
case LOCAL_GL_FLOAT_MAT2:
case LOCAL_GL_FLOAT_MAT2x3:
case LOCAL_GL_FLOAT_MAT2x4:
return 2;
case LOCAL_GL_FLOAT_MAT3x2:
case LOCAL_GL_FLOAT_MAT3:
case LOCAL_GL_FLOAT_MAT3x4:
return 3;
case LOCAL_GL_FLOAT_MAT4x2:
case LOCAL_GL_FLOAT_MAT4x3:
case LOCAL_GL_FLOAT_MAT4:
return 4;
default:
return 1;
}
}
bool
WebGLProgram::ValidateAfterTentativeLink(nsCString* const out_linkLog) const
{
@ -1068,9 +1094,9 @@ WebGLProgram::ValidateAfterTentativeLink(nsCString* const out_linkLog) const
std::map<uint32_t, const webgl::AttribInfo*> attribsByLoc;
for (const auto& attrib : linkInfo->attribs) {
const uint32_t elemSize = ElemSizeFromType(attrib.mActiveInfo->mElemType);
const uint32_t numUsedLocation = (elemSize + 3) / 4;
for (uint32_t i = 0; i < numUsedLocation; i++) {
const auto& elemType = attrib.mActiveInfo->mElemType;
const auto numUsedLocs = NumUsedLocationsByElemType(elemType);
for (uint32_t i = 0; i < numUsedLocs; i++) {
const uint32_t usedLoc = attrib.mLoc + i;
const auto res = attribsByLoc.insert({usedLoc, &attrib});