From: Brian P. <br...@tu...> - 2002-12-05 16:37:56
|
Ian Romanick wrote: > On Tue, Dec 03, 2002 at 05:05:26PM -0800, Ian Romanick wrote: > >>Unless there are any objections, I'm going to commit a merge from the trunk >>to the texmem-0-0-1 branch tomorrow (Wednesday). I've tested the merge on >>the R100, and I'll test it on an M6 and a G400 before I commit it. > > > I am in the process of commiting the merge. By the time this messages gets > to most people, it should be done. I have tested on r100, M6, and G400 > hardware. The r200 & r128 drivers pass the "it compiles" test. > > Merging in the r200 changes causes some changes in other parts of the code. > I modified the routines in texmem.c to calculate mipmap & size limits for 3D > textures, cube maps, and texture rectangles. Right now the r200 is the only > driver that supports these texture types, so I have not tested this code > thoroughly. I would greatly appreciate it if somebody could compare the > output of 'glxinfo -l' (from a recent Mesa build) on r200 from the trunk and > the branch. A slightly different calculation method is used, so the results > may not be exactly the same, but they should be close. > > I made some additional changes to the locking, texture upload, and state > tracking in the r128 driver. This was done to make it more like the r100 > and r200 drivers. I believe that it is correct, but I may have > inadvertently introduced errors. > > Could somebody with the appropriate documentation add the missing #defines > to radeon_reg.h to support texture rectangles, 3D textures, and cubic > textures? It should be pretty trivial to back-port support for these > features from the r200 driver once the registers are known. I've added the cube map and NPOT registers. Couldn't find anything for 3D textures (Q-axis clamp, filter, size). -Brian |