Brian Paul wrote:

Apart from that I get a some few rejections in main/texstore.c, now:

patching file main/texstore.c
Hunk #1 succeeded at 2497 (offset 1722 lines).
Hunk #2 succeeded at 2548 with fuzz 2 (offset 1748 lines).
Hunk #3 succeeded at 2602 (offset 1741 lines).
Hunk #4 succeeded at 2653 with fuzz 2 (offset 1769 lines).
Hunk #5 FAILED at 2709.
Hunk #6 FAILED at 2732.
Hunk #7 succeeded at 2726 with fuzz 2 (offset 1721 lines).
Hunk #8 succeeded at 2807 with fuzz 2 (offset 1753 lines).
Hunk #9 succeeded at 2889 with fuzz 2 (offset 1787 lines).
Hunk #10 succeeded at 3048 with fuzz 2 (offset 1793 lines).
Hunk #11 succeeded at 3973 (offset 1947 lines).
Hunk #12 succeeded at 4045 (offset 1947 lines).
2 out of 12 hunks FAILED -- saving rejects to file main/texstore.c.rej

The compressed texture code/infrastructure isn't quite up to date right now. I'll try to put a bit of work into it one of these days.
What exactly is missing? I've just updated the patch and it seems to work fine. It's not quite correct though, for instance it doesn't handle offsets at all, but at least it works for quake3 (and games which use precompressed textures like nwn).

What's new:
- Updated to new texstore code (defined _mesa_texstore_rgb[a]_dxt[1,3,5]) functions
- dropped the forced compression of all textures. This has cut the patch size almost in half. Mesa can't handle this (since it decides if a texture is compressed before the call to ChooseTextureFormat is made), and the previously used hacks are just ugly, not to mention likely updates to this portion of the code would have been needed. Anyway, it wasn't OGL-conformant, it didn't work in a useful way with dynamic textures, and probably nobody except me (for testing) has ever used it, so it's probably no great loss. The idea was this would help with almost-no-ram mobile chips, but a better fix for that would be to change the buffer allocation scheme.
- The dxt compression/decompression library Makefile now has an install target ;-)
- fixed that ugly bug in the debug printf in the r200 driver...

Roland


Attachment: mesa_r200_radeon_txc_new_noforce.diff.gz
Description: Unix tar archive

Attachment: libtxc_dxtn.tar.gz
Description: Unix tar archive

Reply via email to