Hi Jorge,
I am swampt with the work but at the end, I tested it. Output of OSG_INFO:
glVersion=4.11066, isGlslSupported=YES, glslLanguageVersion=4.1
so, all the numbers are ok, at least on my Radeon system.
However, there were some compile warnings:
In file included from /data/OSG-trunk/src/osg/GLExtensions.cpp:16:0:
/data/OSG-trunk/include/osg/Math:248:102: warning: extra ‘;’
/data/OSG-trunk/src/osg/Math.cpp: In function ‘double
osg::findAsciiToDouble(const char*)’:
/data/OSG-trunk/src/osg/Math.cpp:130:1: warning: control reaches end of non-
void function
Concerning the second issue, I suggest to resolve it in following way:
double osg::findAsciiToDouble(const char* str)
{
const char* ptr = str;
double value = 0;
while(*ptr != 0) {
if(*ptr>='0' && *ptr<='9') {
value = asciiToDouble(ptr);
return value;
}
++ptr;
}
return 0.;
}
Sorry, I can not resubmit the files as I have number of local changes in the
files.
John
> ------------ Original message ------------
> From: Jorge Izquierdo Ciges <[email protected]>
> Subject: Re: [osg-submissions] Android small patches
> Date: 20. 5. 2011 12:34:46
> ----------------------------------------
> PC john, Csaba. Can you test this patch? Basically it does what i said in
> my previous message search the first digit and get version number from
> that position. That way we shouldn't have any more trouble if any more
> company wants to add stupid things in their String Versions to be
> different than other companies.
>
> One more time I'm sorry for my mistake >_<
>
> 2011/5/19 PC John <[email protected]>
>
> > Hi Jorge,
> > thanks for developing Android platform.
> > Attaching examples of strings on standard computers I have around.
> >
> > GL_VENDOR:
> > AMD: 4.1.10665 Compatibility Profile Context
> > NVIDIA (Windows): 4.1.0
> > NVIDIA (Linux): 2.1.2 NVIDIA 169.12
> > Mesa: 2.1 Mesa 7.5.1
> > ATI (old): 2.1.7412 Release
> > Intel: 1.4.0 - Build 7.14.10.4926
> >
> > and of GL_SHADING_LANGUAGE_VERSION:
> > AMD: 4.10
> > NVIDIA: 4.10 NVIDIA via Cg compiler
> > Mesa: 1.20
> >
> > John
> >
> > > ------------ Original message ------------
> > > From: Jorge Izquierdo Ciges <[email protected]>
> > > Subject: Re: [osg-submissions] Android small patches
> > > Date: 19. 5. 2011 18:08:28
> > > ----------------------------------------
> > > I'll look into it a little more deep. But I think that i made the
> > > mistake because the string that appeared to me was always this way
> > > [vendor][space][number] and [vendor][space][GLSL][space][number] So
> > > maybe it would be safer to change the function to recover only a
> > > double from
> >
> > the
> >
> > > string with a function that were not so agressive and even if it find
> >
> > some
> >
> > > non digit just skip it and start getting double when he finds a number
> > > until a secon dot or a space (I don't think anyone would need any more
> > > than 4.2, 4.1...
> > >
> > > 2011/5/19 PC John <[email protected]>
> > >
> > > > tr leads to the conversion until first non-number character is
> > > > found, e.g. "4.1.10524 Compatibility Profile Context" is converted to
> > > > 4.110524f
> > > > . Tested on MSVC 2005 Radeon/GeForce, and Linux Radeon.
> >
> > _______________________________________________
> > osg-submissions mailing list
> > [email protected]
> >
> > http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegra
> > ph.org
_______________________________________________
osg-submissions mailing list
[email protected]
http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org
