summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri/savage/savagetex.c
AgeCommit message (Collapse)Author
2008-09-21mesa: standardize on C99's uint*_t instead of u_int*_tKeith Whitwell
2008-09-18mesa: added "main/" prefix to includes, remove some -I paths from ↵Brian Paul
Makefile.template
2008-06-21replace __inline and __inline__ with INLINE macroBrian Paul
2007-10-10Replace open-coded major, minor, and patch version fields with __DRIversionRec.Kristian Høgsberg
2006-06-09shuffle some code to make some assertions in the _savage_texstore_a111xxxx ↵Roland Scheidegger
functions compile without error...
2006-05-20In gl_texture_image, replace ImageStride with an ImageOffsets array.Brian Paul
Some hardware lays out 3D mipmaps in a manner that can't be expressed with a simple image stride. The ImageOffsets array is allocated and initialized to typical defaults in the _mesa_init_teximage_fields() function. If needed, a driver will then have to replace these offsets. TexStore and TexelFetch routines updated to use offsets array.
2005-10-05In gl_texture_image replace IntFormat with InternalFormat and Format withBrian Paul
_BaseFormat to be consistant with gl_renderbuffer.
2005-09-22Enable GL_ARB_texture_mirrored_repeat on Savage4. Refactor the code thatIan Romanick
sets the texture wrap mode and texture filter mode for Savage4 to the new functions savage4_set_wrap_mode and savage4_set_filter_mode. This was tested with texwrap and tunnel.
2005-05-01Fixed and cleaned up programming of watermark registers. There may beFelix Kuehling
a marginal speedup, but I'm not sure this has the same effect on all hardware. Tested on Savage IX and ProSavageDDR. For experimenting with different values see the macros at the start of savagestate.c.
2005-04-30Added S3TC support to the Savage driver with some help from Mark Cass'sFelix Kuehling
S3TC support for an older driver version. On Savage3D/IX/MX GL_EXT_texture_compression_s3tc can't be enabled because DXT3 and DXT5 are not supported. However GL_S3_s3tc is enabled on all Savage chips. Tested on a Savage IX and a ProSavageDDR
2005-04-23Texturing fixes for Savage3D/MX/IX:Felix Kuehling
- force emitting texAddr when the texture image changed (flush caches) - set transparent texture color key to something improbable (couldn't find a way to disable it completely) - fixed texture environment modes GL_DECAL and GL_REPLACE - made texture environment mode GL_BLEND a software fallback - added two custom texture formats for promoting from GL_ALPHA to ARGB8888 and 4444. Since the hardware can't be made to ignore the RGB color components, set them to 1 instead of 0. This gives the correct results - disabled GL_EXT_texture_env_add on Savage3D/MX/IX - map both GL_CLAMP and GL_CLAMP_TO_EDGE to hardware mode "wrap". It doesn't match either mode exactly by the spec, so we should either fall back on both or none. I chose the latter. - fall back to software when s and t wrapping modes differ (hardware has only one bit for both)
2005-04-21Fixed some suspicious pointer casts that caused lots ofFelix Kuehling
compile-time-warnings on x86-64. Not tested on x86-64 yet, but a good thing in general, so I'm giving up waiting for feedback. See also https://bugs.freedesktop.org/show_bug.cgi?id=2924.
2005-04-21Fixed TexEnv modes GL_BLEND and GL_ADD on Savage4-based cards. DisabledFelix Kuehling
the use of hardware texture format I8 as it produces garbage at least on ProSavageDDR.
2005-03-14When timestamping textures, need to emit the event with SAVAGE_WAIT_3DFelix Kuehling
set. Otherwise the 3D engine may still be using a texture that is being overwritten. In order to minimize the cost of waiting, timestamp textures only when needed: when a texture image changes, when a different texture is bound to a texture unit or when a texture unit is disabled. (Used to be after flushing every command buffer.)
2005-03-10- Flush before updating the timestamp of a texture heap from a bound texture.Felix Kuehling
- Flush before using a new texture or before disabling a texture unit, because savageFlushCmdBuf can only update the timestamp of the last used texture. This fixes corruption in quake2 with single-textured lighting.
2005-02-23Don't forget to update a heap's timestamp when a texture image isFelix Kuehling
changed. Other drivers don't need to do this because they're swapping modified textures out of texture memory, which implies a timestamp update.
2005-02-23With Savage DRM version 2.3.x or later use event counters for textureFelix Kuehling
heap aging, similar to the way it's done in the i810 and i855 drivers. This avoids idling the engine on every texture upload.
2005-02-12Offset LOD bias by about 0.3 to match software rendering more closely.Felix Kuehling
Another small tweak to subtile upload (mostly cosmetic).
2005-02-12Savage3D-based chips seem so use a constant tile stride of 2048 forFelix Kuehling
vertically incomplete tiles, but only if the color depth is 32bpp. Nobody said this was supposed to be logical!
2005-02-09Fixed stride of incomplete tiles.Felix Kuehling
2005-02-04Made subtile upload a template. This speeds up tiled texture uploads byFelix Kuehling
about a factor 1.3.
2005-02-02Fixed some debug output that was unconditionally enabled.Felix Kuehling
2005-01-29* Fixed uploading of textures of certain sizes.Felix Kuehling
* When glTexSubImageND is used, track the set of changed tiles in a bit vector and upload only dirty tiles later. This should improve the performance of dynamic light maps and gl movie player plugins. * Renamed debug item "lru" to "tex". Indicate which levels are uploaded completely or partially.
2005-01-24Converted the Savage texture management to use Ian's common texmem code.Felix Kuehling
2005-01-21Small cleanup:Felix Kuehling
* Remove some unused (mostly empty) functions * Added context parameter to WAIT_IDLE_EMPTY[_LOCKED] for consistency * Added debug messages to WAIT_IDLE_EMPTY[_LOCKED] * Don't flush empty command buffers
2005-01-10Fixes to cope with the lack of AGP textures. This is all that's neededFelix Kuehling
to support PCI Savages on the Mesa side. Bumped driver date.
2005-01-05* Fixed handling of scissorsFelix Kuehling
* Only set scissor regs directly if drmMinor < 1 * Don't set texaddr to 0 when a texture unit is disabled. That would trigger the tightened texture state check in the DRM if the texaddr and texdesc registers were not emitted atomically.
2005-01-01Removed all direct hardware access (MMIO, BCI) from the Savage DRIFelix Kuehling
driver. It uses the new DRM version 2.0.x now, which has just been committed to DRM CVS.
2004-12-22Enabled hardware rendering of 1D textures. No need for a software fallback.Felix Kuehling
2004-12-17Made debugging output controllable via environment variableFelix Kuehling
SAVAGE_DEBUG. Added fallback debugs. Added no_rast option to disable hardware rasterization (everything as software fallback).
2004-12-15Added configuration support to the Savage driver. Three options areFelix Kuehling
supported so far.
2004-12-15Fixed GL_CLAM_TO_EDGE. It's not supported in hardware. Use GL_CLAMPFelix Kuehling
instead of GL_REPEAT.
2004-12-14uint*t -> u_int*tAlan Hourihane
2004-03-25More state management changes:Felix Kuehling
- Don't lock in savageDDUpdateStatte, don't call savageEmitHwStateLocked - Need to grab the lock for texture uploads now - New SAVAGE_NEW_CULL bit in new_state to make sure that culling state and raster_primitive are not examined at the wrong times.
2004-03-24Buffer vertices and emit them in batches. Still using conventional drawingFelix Kuehling
commands, no vertex DMA.
2004-03-21unsigned int -> uint32_t, unsigned char -> uint8_t where the size matters.Felix Kuehling
A bit more cosmetics. Improved state emit on Savage 3D/IX/MX.
2004-03-20Fixed texture LOD bias.Felix Kuehling
2004-03-20Fixed MAXFIFO_S4. Removed WAIT_IDLE_EMPTY from savage_BCI_swap which resultedFelix Kuehling
in another small speedup. Fixed a problem that was masked by that WAIT_IDLE_EMPTY: - flush command buffer and WAIT_IDLE_EMPTY before uploading textures
2004-03-08Cleaned up and slightly optimized the texture upload code.Felix Kuehling
2004-03-08Swapout textures who's space is claimed by a new texture. Don't destroy.Felix Kuehling
This finally really fixes assertion failures in savageBindTexture. I think the same situation with several contexts is still broken though.
2004-03-07Fixed texture tiling format for 8bit texels on ProSavage and Twister.Felix Kuehling
2004-03-07Rewrote tiled texture upload. Small mipmap levels work correctly now.Felix Kuehling
2004-03-04Small texture management fixes. Should get rid of assertions some people ↵Felix Kuehling
were getting in savageBindTexture.
2004-02-29Reorganized hardware state data structures and state emission. Don't trackFelix Kuehling
which registers changed in all the functions that change the state. Instead check which registers changed in the end when the hardware state is updated. Tried to avoid cosmetic (whitespace) changes in this commit.
2004-02-22Imported the Savage DRI driver from the savage-2-0-0-branch of DRI CVSFelix Kuehling
with modifications to make it work with current Mesa 6.
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-11 19:08:30 +0000