summaryrefslogtreecommitdiff
path: root/src/mesa/main/teximage.c
AgeCommit message (Collapse)AuthorFilesLines
2009-05-01mesa: fix state validation bug for glCopyTex[Sub]Image()Brian Paul1-5/+16
We need to make sure the framebuffer state is up to date to make sure we read pixels from the right buffer when doing a texture image copy. (cherry-picked from master, commit 63f01309801c5a900d8d7f5ccd63413e33ff9bff)
2009-03-13mesa: use an array for current texture objectsBrian Paul1-7/+7
Use loops to consolidate lots of texture object code. (cherry picked from commit 9818734e0148510967ca9ee0d1aa8b196b509f02)
2009-03-13mesa: minor error msg improvement (cherry picked from commit ↵Brian Paul1-1/+2
803504e69fbd85713fc6d93af21f5245852cecab)
2009-01-30mesa: fix incorrect call to clear_teximage_fields() in _mesa_TexImage2D()Brian Paul1-1/+1
Fixes failed assertion / segfault for particular proxy texture tests. (cherry picked from master, commit ea4b183b8c3730ec2c6b5152cad1a68889634487)
2008-11-10mesa: new _mesa_is_pow_two() functionBrian1-18/+18
2008-10-22mesa: move convolution image adjustment code for glCopyTexSubImage1/2/3D()Brian Paul1-15/+21
Do it after initial error checking, after we know the texture's internal format.
2008-10-22mesa: some re-org of glCopyTexSubImage1/2/3D() error checkingBrian Paul1-33/+32
2008-10-22mesa: in textore.c, only adjust image for convolution if image is a color formatBrian Paul1-12/+15
Makes things consistant with the code in teximage.c. We only want to apply convolution to color formats (not depth/index formats)
2008-10-01Unify ARB_depth_texture and SGIX_depth_textureIan Romanick1-10/+8
The ARB extension is a superset of the older SGIX extension. Any hardware that can support the SGIX version can also support the ARB version. In Mesa, any driver that supports one also supports the other. This unification just simplifies some bits of code.
2008-09-23Added new _mesa_clip_copytexsubimage() function to do avoid clipping down in ↵Brian1-7/+23
the drivers. This should probably be pulled into main-line Mesa... (cherry picked from commit 324ecadbfdf9b944e059832f146451e4151dcb21)
2008-09-21added _mesa_tex_target_to_face()Brian1-7/+13
(cherry picked from commit b52ce6341f877a0a1cfd3c50c07eeb1c156ae89e)
2008-09-21mesa: refactor: move #define FEATURE flags into new mfeatures.h fileKeith Whitwell1-1/+20
Also, check the FEATURE flags in many places. (cherry picked from commit 40d1a40f294f1ed2dacfad6f5498322fc08cc2d1) Conflicts: src/mesa/main/config.h src/mesa/main/context.c src/mesa/main/texobj.c src/mesa/main/texstate.c src/mesa/main/texstore.c
2008-03-21Fix some PBO breakage.Brian1-3/+0
In _mesa_Bitmap, can't early return if bitmap ptr is NULL, it may be an offset into a PBO. Similarly for _mesa_GetTexImage.
2008-01-05fix depth/1 typo in glTexImage3D proxy codeBrian1-3/+3
2007-08-18some fixes for compressed cube maps (bug 11986)Brian1-2/+2
2007-08-16Replace Proxy1D/2D/etc with ProxyTex[] indexed by TEXTURE_x_INDEX.Brian1-29/+29
Simplification in colortab.c too.
2007-07-12fix width/depth mix-up (bug 11577)Brian1-1/+1
2007-07-08Fix size test bug in _mesa_test_proxy_teximage().Brian1-13/+17
width/height/depth == 0 is a legal texture size (no error generated). Later, the texture will be considered incomplete, however, and texturing will effectively be disabled. See bug 11309.
2007-06-12fix an error string, refactor _mesa_GetCompressedTexImageARB() to get rid of ↵Brian1-17/+17
a goto
2007-06-11Replace texobj->Complete with texobj->_Complete since it's a derived field.Brian1-8/+8
2007-05-17Add missing _EXT suffix to 2D_ARRAY target enums.Ian Romanick1-2/+2
2007-05-17Add array texture targets to list that can use compressed formats.Ian Romanick1-1/+4
2007-05-17Refactor determining whether a texture target can use compressed formatIan Romanick1-25/+19
2007-05-16Initial implementation of MESA_texture_arrayIan Romanick1-9/+143
Shadow sampling from texture arrays is still not implemented. Everything else should be there, though.
2007-05-10Refactor the way TestProxyTexImage is called in texture_error_check.Ian Romanick1-22/+15
2007-03-22Ensure we have a valid ReadBuffer for CopyTexSubImage, andAlan Hourihane1-6/+6
if not bail accordingly. Previously we'd only do this test on compressed textures.
2006-11-02s/GLchan/GLubyte/ in debug codeBrian Paul1-3/+3
2006-11-01Merge texmem-0-3-branch.Keith Whitwell1-452/+628
2006-10-04minor formatting fixBrian Paul1-1/+1
2006-08-04more work for GL_EXT_texture_sRGB.Brian Paul1-0/+72
2006-07-19For glGetTexImage(), move the _mesa_validate_pbo_access() error check intoBrian Paul1-0/+12
_mesa_GetTexImage() so it's not needed in the fallback or driver functions.
2006-07-18indentation fixBrian Paul1-5/+5
2006-07-18add missing 'return' after a few _mesa_error() calls in _mesa_GetTexImage()Brian Paul1-1/+5
2006-06-13fix size assertions in _mesa_init_teximage_fields()Brian Paul1-3/+3
2006-06-02fix depth-component test to allow rectangular texturesBrian Paul1-2/+4
2006-05-20In gl_texture_image, replace ImageStride with an ImageOffsets array.Brian Paul1-5/+25
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.
2006-05-09Add a new 'all' parameter to _mesa_get_compressed_formats() to indicate whetherBrian Paul1-1/+1
all formats or just those without restrictions/limitations should be returned. We want all when validating the internalFormat parameter to glCompressedTexImage2D but only want unrestricted formats when handling the GL_COMPRESSED_TEXTURE_FORMATS query.
2006-05-08More updates for texture compression.Brian Paul1-25/+28
Added _mesa_compressed_texture_size_glenum() for validating the imageSize parameter to glCompressedTex[Sub]Image1/2/3() which does _not_ call ctx->Driver.CompressedTextureSize() - since that could return a padded size.
2006-05-08Fix a number of texture compression issues.Brian Paul1-7/+6
Pass the MESA_FORMAT_* token to the _mesa_compressed_row_stride(), _mesa_compressed_texture_size() and _mesa_compressed_image_address() functions since we want to use the driver-chosen format, not the user's internalFormat hint. Consolidate code related to choosing the texture format in texstoree.c
2006-03-26merge from texman branchmesa_20060325Brian Paul1-3/+6
2006-03-20Lots of changes/fixes for rendering to framebuffer objects.Brian Paul1-7/+58
- When deleting texture objects, unbind from FBOs if necessary. - Changed driver hooks for starting/ending render to texture. - Now properly handle case where gl[Copy]TexImage() is called after glFramebufferTexture[123]D(). That didn't work before.
2006-03-20additional error checking to be sure source renderbuffer exists for ↵Brian Paul1-2/+36
glCopyTex[Sub]Image()
2005-12-01added comment about glTexImage and renderbuffersBrian Paul1-0/+6
2005-11-16Use new gl_framebuffer _Depth/_StencilBuffer fields instead ofBrian Paul1-6/+4
Attachment[BUFFER_DEPTH/STENCIL].Renderbuffer. The former may be wrappers around combined depth/stencil renderbuffers attached at the later points.
2005-11-11Make _mesa_is_proxy_texture() non-static and use in a few more places.Brian Paul1-13/+7
Use COPY_4FV() where possible. Added some comments, clean-ups.
2005-11-05minor improvements in _mesa_init_teximage_fields()Brian Paul1-9/+9
2005-10-05In gl_texture_image replace IntFormat with InternalFormat and Format withBrian Paul1-11/+11
_BaseFormat to be consistant with gl_renderbuffer.
2005-10-01additional error checking for GL_EXT_packed_depth_stencilBrian Paul1-13/+50
2005-09-28Initial work for GL_EXT_packed_depth_stencil extension.Brian Paul1-1/+39
glReadPixels done, glDrawPixels mostly done.
2005-09-15New set_fetch_functions() to set a gl_texture_image's FetchTexel functionsBrian Paul1-40/+0
from the gl_texture_format's functions. Added "adaptor" functions to allow sampling a float-valued texture with GLchans and vice versa. This will allow trimming down the number of texture fetch routines.