LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am a75d7c69: Merge "opengles emulator: fix GLESv2 shader source packing"

Browse Source 
* commit 'a75d7c694be060f9f88be30210f341c651549532':
  opengles emulator: fix GLESv2 shader source packing
This commit is contained in:
David Turner
2011-08-09 08:44:10 -07:00
committed by Android Git Automerger
parent ad3166add7 a75d7c694b
commit 30dce17194
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tools/emulator/opengl/shared/OpenglCodecCommon/glUtils.cpp
View File

@@ -373,13 +373,15 @@ void glUtilsPackStrings(char *ptr, char **strings, GLint *length, GLsizei coun
char *p = ptr;
*p = '\0';
for (int i = 0; i < count; i++) {
int l;
if (length == NULL || length[i] < 0) {
l = strlen(strings[i]);
strcat(p, strings[i]);
} else {
l = length[i];
strncat(p, strings[i], l);
int l=0;
if (strings[i]!=NULL) {
if (length == NULL || length[i] < 0) {
l = strlen(strings[i]);
strcat(p, strings[i]);
} else {
l = length[i];
strncat(p, strings[i], l);
}
}
p += l;
}
@@ -392,7 +394,7 @@ int glUtilsCalcShaderSourceLen( char **strings, GLint *length, GLsizei count)
for (int i = 0; i < count; i++) {
int l;
if (length == NULL || length[i] < 0) {
l = strlen(strings[i]);
l = strings[i]!=NULL ? strlen(strings[i]) : 0;
} else {
l = length[i];
}