mirror of
https://github.com/ultimatepp/ultimatepp.git
synced 2026-07-11 22:03:01 -06:00
GLDraw: Texture driver leaks plugged, ide: GDB does not stop at 'unknown' frames in backtrace
git-svn-id: svn://ultimatepp.org/upp/trunk@12578 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
parent
23736658c8
commit
6297f548a8
2 changed files with 15 additions and 10 deletions
|
|
@ -8,6 +8,7 @@ namespace Upp {
|
|||
|
||||
GLuint CreateGLTexture(const Image& img, dword flags)
|
||||
{
|
||||
MemoryIgnoreLeaksBlock __; // Linux drivers seem to be calling new without delete
|
||||
Size sz = img.GetSize();
|
||||
GLuint texture_id;
|
||||
glGenTextures(1, &texture_id);
|
||||
|
|
|
|||
|
|
@ -46,21 +46,25 @@ String FormatFrame(const char *s)
|
|||
s++;
|
||||
while(*s == ' ')
|
||||
s++;
|
||||
if(s[0] != 'i' && s[1] != 'n')
|
||||
return Null;
|
||||
s += 2;
|
||||
if(s[0] == 'i' && s[1] == 'n')
|
||||
s += 2;
|
||||
while(*s == ' ')
|
||||
s++;
|
||||
}
|
||||
if(!IsAlpha(*s))
|
||||
return Null;
|
||||
String result;
|
||||
const char *w = strchr(s, '\r');
|
||||
if(!w)
|
||||
w = strchr(s, '\n');
|
||||
if(w)
|
||||
return String(s, w);
|
||||
w = strchr(s, '\n');
|
||||
if(w)
|
||||
return String(s, w);
|
||||
return s;
|
||||
result = String(s, w);
|
||||
else
|
||||
result = s;
|
||||
if(!IsAlpha(*s)) {
|
||||
int q = result.ReverseFind(' ');
|
||||
if(q >= 0)
|
||||
result = result.Mid(q + 1);
|
||||
}
|
||||
return result.GetCount() > 2 ? result : Null;
|
||||
}
|
||||
|
||||
void Gdb::CopyStack()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue