Michel Dänzer wrote:
On Thu, 2006-09-21 at 12:58 +0100, Keith Whitwell wrote:> Michel Dänzer wrote:> > On Wed, 2006-09-20 at 18:56 +0000, Keith Whitwell wrote:>
>>> >> Log message:> >> Support both big and little endian, more source types and more> >> destination formats
through the swizzle path. It would be great to> >> see this tested on eg, PPC machines...> > > > With the current trunk, glean
pixelFormats fails 201 combinations on big> > endian with both drivers, of which this commit broke 42 and the 'Extend
'Both drivers' referring to r200 and r300 BTW. I haven't tried softwareMesa yet.
swizzle support to all remaining source formats and texture destination> > formats.' commit the other 159 (yay
git-bisect! :).> > > > Changing type_endian_mapping() to return map_identity for> > GL_UNSIGNED_BYTE
brings it down to 144 and changing the last two> > components of map_3210 to { 7, 6 } to 138, > > I think this
must be a fluke - the 4,5 there refer to ZERO,ONE defined > elsewhere. Those values are always at 4,5 and are only
addressed as > elements in an array of bytes - I can't see how their positions might > change in littleEndian machines.
Yeah, as I said, I didn't really know what I was doing, it was justtrial and
error. :)
Michel,
Maybe we can look at the failures one at a time - the attached patch
causes the test to abort after the first real failure - can you use that
and maybe turn on the printf in compute_component_mapping() to get the
first failure and post it here?
Keith
? d1.diff
? diff
Index: tpixelformats.cpp
===================================================================
RCS file: /cvsroot/glean/glean/src/glean/tpixelformats.cpp,v
retrieving revision 1.6
diff -u -r1.6 tpixelformats.cpp
--- tpixelformats.cpp 13 Sep 2006 14:15:42 -0000 1.6
+++ tpixelformats.cpp 21 Sep 2006 12:53:34 -0000
@@ -37,9 +37,11 @@
// formats, types, internformats below so the failure case comes first.
#define DEBUG 0
+#undef GL_EXT_texture_sRGB
namespace GLEAN {
+static int do_abort = 0;
struct NameTokenComps {
const char *Name;
@@ -1179,6 +1181,7 @@
image[i + 0], image[i + 1], image[i + 2], image[i + 3]);
env->log << msg;
ok = false;
+ do_abort = 1;
break;
}
}
@@ -1291,6 +1294,9 @@
env->log << " Type: " << Types[typeIndex].Name << "\n";
env->log << " Internal Format: " << InternalFormats[intFormat].Name << "\n";
+ if (do_abort)
+ abort();
+
r.numFailed++;
}
else {
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Mesa3d-dev mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
