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

Bug 649233 - Include ANGLE r611. r=joe

Browse Source 
--HG--
extra : rebase_source : 7d917f7bdca76e0abbea6ce5ac41154e2285ec79
This commit is contained in:
Benoit Jacob 2011-04-12 00:36:13 -07:00
parent fc87700d74
commit 8f960175f1
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gfx/angle/src/common/version.h
View File

@ -1,7 +1,7 @@
#define MAJOR_VERSION 0
#define MINOR_VERSION 0
#define BUILD_VERSION 0
#define BUILD_REVISION 541
#define BUILD_REVISION 611
#define STRINGIFY(x) #x
#define MACRO_STRINGIFY(x) STRINGIFY(x)

3
gfx/angle/src/compiler/preprocessor/atom.c
View File

@ -182,12 +182,13 @@ static int AddString(StringTable *stable, const char *s)
char *str;
len = (int) strlen(s);
if (stable->nextFree + len + 1 >= stable->size) {
while (stable->nextFree + len + 1 >= stable->size) {
assert(stable->size < 1000000);
str = (char *) malloc(stable->size*2);
memcpy(str, stable->strings, stable->size);
free(stable->strings);
stable->strings = str;
stable->size = stable->size*2;
}
loc = stable->nextFree;
strcpy(&stable->strings[loc], s);

7
gfx/angle/src/libGLESv2/Program.cpp
View File

@ -2732,7 +2732,12 @@ GLint Program::getActiveUniformMaxLength()
{
if (!mUniforms[uniformIndex]->name.empty() && mUniforms[uniformIndex]->name.substr(0, 3) != "dx_")
{
maxLength = std::max((int)(undecorate(mUniforms[uniformIndex]->name).length() + 1), maxLength);
int length = (int)(undecorate(mUniforms[uniformIndex]->name).length() + 1);
if (mUniforms[uniformIndex]->arraySize != 1)
{
length += 3; // Counting in "[0]".
}
maxLength = std::max(length, maxLength);
}
}