summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/teximage.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'gallium-0.1' into gallium-0.2Keith Whitwell2008-09-111-21/+73
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A first attempt at moving gallium onto a branch directly off master... It will be interesting to see how much work this takes to get running. Have resolved the conflicts semi-arbitarily, not compiled or tested. Conflicts: .gitignore Makefile configs/config.mgw configs/darwin configs/darwin-x86ppc configs/default configs/freebsd-dri configs/linux-dri configs/linux-dri-xcb configs/linux-fbdev configs/linux-static configs/linux-x86-64-static configs/linux-x86-static doxygen/Makefile include/GL/gl.h progs/demos/Makefile progs/demos/descrip.mms progs/demos/texenv.c progs/egl/.gitignore progs/egl/Makefile progs/glsl/.gitignore progs/glsl/Makefile progs/glsl/convolutions.c progs/samples/Makefile.mgw progs/tests/.gitignore progs/trivial/.gitignore progs/trivial/point-param.c progs/trivial/tri.c progs/xdemos/.gitignore progs/xdemos/glthreads.c src/egl/drivers/demo/Makefile src/egl/drivers/dri/Makefile src/egl/main/Makefile src/glu/Makefile src/glu/sgi/Makefile src/glu/sgi/Makefile.mgw src/glut/glx/Makefile.mgw src/glut/os2/WarpWin.cpp src/glut/os2/glut_cindex.cpp src/glut/os2/glut_gamemode.cpp src/glut/os2/glut_win.cpp src/glut/os2/glut_winmisc.cpp src/glut/os2/os2_glx.cpp src/glut/os2/os2_menu.cpp src/glut/os2/os2_winproc.cpp src/glw/Makefile src/glx/x11/dri_glx.c src/glx/x11/glxext.c src/mesa/Makefile src/mesa/Makefile.mgw src/mesa/descrip.mms src/mesa/drivers/beos/Makefile src/mesa/drivers/common/descrip.mms src/mesa/drivers/common/driverfuncs.c src/mesa/drivers/directfb/Makefile src/mesa/drivers/dri/Makefile.template src/mesa/drivers/dri/common/dri_bufmgr.c src/mesa/drivers/dri/common/dri_bufmgr.h src/mesa/drivers/dri/common/dri_util.c src/mesa/drivers/dri/common/extension_helper.h src/mesa/drivers/dri/common/mmio.h src/mesa/drivers/dri/common/utils.c src/mesa/drivers/dri/common/utils.h src/mesa/drivers/dri/glcore/Makefile src/mesa/drivers/dri/i810/i810screen.c src/mesa/drivers/dri/i915/intel_ioctl.c src/mesa/drivers/dri/i915/intel_ioctl.h src/mesa/drivers/dri/i915/intel_screen.c src/mesa/drivers/dri/i915/server/i830_common.h src/mesa/drivers/dri/i915/server/i830_dri.h src/mesa/drivers/dri/i965/intel_screen.c src/mesa/drivers/dri/i965/server/i830_common.h src/mesa/drivers/dri/i965/server/i830_dri.h src/mesa/drivers/dri/mach64/mach64_screen.c src/mesa/drivers/dri/nouveau/nouveau_context.h src/mesa/drivers/dri/nouveau/nouveau_fifo.c src/mesa/drivers/dri/nouveau/nouveau_fifo.h src/mesa/drivers/dri/nouveau/nouveau_screen.c src/mesa/drivers/dri/nouveau/nouveau_screen.h src/mesa/drivers/dri/r128/r128_tex.h src/mesa/drivers/dri/savage/savageioctl.h src/mesa/drivers/fbdev/Makefile src/mesa/drivers/osmesa/Makefile src/mesa/drivers/osmesa/descrip.mms src/mesa/drivers/x11/Makefile src/mesa/drivers/x11/descrip.mms src/mesa/drivers/x11/xm_dd.c src/mesa/glapi/glapi.c src/mesa/glapi/glthread.c src/mesa/main/api_validate.c src/mesa/main/attrib.c src/mesa/main/bufferobj.c src/mesa/main/bufferobj.h src/mesa/main/buffers.c src/mesa/main/config.h src/mesa/main/context.c src/mesa/main/descrip.mms src/mesa/main/drawpix.c src/mesa/main/enums.c src/mesa/main/fbobject.c src/mesa/main/glheader.h src/mesa/main/imports.c src/mesa/main/mipmap.c src/mesa/main/mm.c src/mesa/main/mm.h src/mesa/main/mtypes.h src/mesa/main/points.c src/mesa/main/sources src/mesa/main/state.c src/mesa/main/texcompress_fxt1.c src/mesa/main/texenvprogram.c src/mesa/main/texobj.c src/mesa/main/texstate.c src/mesa/main/texstore.c src/mesa/math/descrip.mms src/mesa/shader/arbprogram.c src/mesa/shader/descrip.mms src/mesa/shader/prog_execute.c src/mesa/shader/prog_statevars.c src/mesa/shader/prog_statevars.h src/mesa/shader/prog_uniform.c src/mesa/shader/program.c src/mesa/shader/program.h src/mesa/shader/shader_api.c src/mesa/shader/slang/descrip.mms src/mesa/shader/slang/library/slang_vertex_builtin_gc.h src/mesa/sources src/mesa/swrast/descrip.mms src/mesa/swrast/s_drawpix.c src/mesa/swrast/s_fragprog.c src/mesa/swrast/s_readpix.c src/mesa/swrast/s_span.c src/mesa/swrast_setup/descrip.mms src/mesa/tnl/descrip.mms src/mesa/tnl/t_context.h src/mesa/tnl/t_vp_build.c src/mesa/tnl/tnl.h src/mesa/vbo/descrip.mms src/mesa/vbo/vbo_context.c src/mesa/vbo/vbo_exec_array.c src/mesa/x86-64/xform4.S src/mesa/x86/rtasm/x86sse.c src/mesa/x86/rtasm/x86sse.h windows/VC6/progs/glut/glut.dsp windows/VC7/mesa/gdi/gdi.vcproj windows/VC7/mesa/glu/glu.vcproj windows/VC7/mesa/mesa.sln windows/VC7/mesa/mesa/mesa.vcproj windows/VC7/mesa/osmesa/osmesa.vcproj windows/VC7/progs/glut/glut.vcproj windows/VC8/mesa/gdi/gdi.vcproj windows/VC8/mesa/glu/glu.vcproj windows/VC8/mesa/mesa.sln windows/VC8/mesa/mesa/mesa.vcproj windows/VC8/progs/glut/glut.vcproj
| * mesa: Replace Proxy1D/2D/etc with ProxyTex[] indexed by TEXTURE_x_INDEX.Brian Paul2008-07-041-29/+29
| | | | | | | | | | | | Simplification in colortab.c too. cherry-picked from master (fe469007037d9d5cdbe1677d8ff7368b276e9e7c)
| * mesa: refactor: move #define FEATURE flags into new mfeatures.h fileBrian Paul2008-06-101-1/+20
| | | | | | | | Also, check the FEATURE flags in many places.
| * Fix some PBO breakage.Brian2008-03-211-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.
| * fix Height2/Depth2 init problem when using texture bordersBrian2008-03-101-6/+17
| |
| * added _mesa_tex_target_to_face()Brian2008-02-111-7/+13
| |
| * Added new _mesa_clip_copytexsubimage() function to do avoid clipping down in ↵Brian2007-09-261-7/+23
| | | | | | | | | | | | the drivers. This should probably be pulled into main-line Mesa...
* | Fix some PBO breakage.Brian2008-03-211-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.
* | fix depth/1 typo in glTexImage3D proxy codeBrian2008-01-051-3/+3
| |
* | some fixes for compressed cube maps (bug 11986)Brian2007-08-181-2/+2
| |
* | Replace Proxy1D/2D/etc with ProxyTex[] indexed by TEXTURE_x_INDEX.Brian2007-08-161-29/+29
|/ | | | Simplification in colortab.c too.
* fix width/depth mix-up (bug 11577)Brian2007-07-121-1/+1
|
* Fix size test bug in _mesa_test_proxy_teximage().Brian2007-07-081-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.
* fix an error string, refactor _mesa_GetCompressedTexImageARB() to get rid of ↵Brian2007-06-121-17/+17
| | | | a goto
* Replace texobj->Complete with texobj->_Complete since it's a derived field.Brian2007-06-111-8/+8
|
* Add missing _EXT suffix to 2D_ARRAY target enums.Ian Romanick2007-05-171-2/+2
|
* Add array texture targets to list that can use compressed formats.Ian Romanick2007-05-171-1/+4
|
* Refactor determining whether a texture target can use compressed formatIan Romanick2007-05-171-25/+19
|
* Initial implementation of MESA_texture_arrayIan Romanick2007-05-161-9/+143
| | | | | Shadow sampling from texture arrays is still not implemented. Everything else should be there, though.
* Refactor the way TestProxyTexImage is called in texture_error_check.Ian Romanick2007-05-101-22/+15
|
* Ensure we have a valid ReadBuffer for CopyTexSubImage, andAlan Hourihane2007-03-221-6/+6
| | | | | | if not bail accordingly. Previously we'd only do this test on compressed textures.
* s/GLchan/GLubyte/ in debug codeBrian Paul2006-11-021-3/+3
|
* Merge texmem-0-3-branch.Keith Whitwell2006-11-011-452/+628
|
* minor formatting fixBrian Paul2006-10-041-1/+1
|
* more work for GL_EXT_texture_sRGB.Brian Paul2006-08-041-0/+72
|
* For glGetTexImage(), move the _mesa_validate_pbo_access() error check intoBrian Paul2006-07-191-0/+12
| | | | _mesa_GetTexImage() so it's not needed in the fallback or driver functions.
* indentation fixBrian Paul2006-07-181-5/+5
|
* add missing 'return' after a few _mesa_error() calls in _mesa_GetTexImage()Brian Paul2006-07-181-1/+5
|
* fix size assertions in _mesa_init_teximage_fields()Brian Paul2006-06-131-3/+3
|
* fix depth-component test to allow rectangular texturesBrian Paul2006-06-021-2/+4
|
* In gl_texture_image, replace ImageStride with an ImageOffsets array.Brian Paul2006-05-201-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.
* Add a new 'all' parameter to _mesa_get_compressed_formats() to indicate whetherBrian Paul2006-05-091-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.
* More updates for texture compression.Brian Paul2006-05-081-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.
* Fix a number of texture compression issues.Brian Paul2006-05-081-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
* merge from texman branchmesa_20060325Brian Paul2006-03-261-3/+6
|
* Lots of changes/fixes for rendering to framebuffer objects.Brian Paul2006-03-201-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.
* additional error checking to be sure source renderbuffer exists for ↵Brian Paul2006-03-201-2/+36
| | | | glCopyTex[Sub]Image()
* added comment about glTexImage and renderbuffersBrian Paul2005-12-011-0/+6
|
* Use new gl_framebuffer _Depth/_StencilBuffer fields instead ofBrian Paul2005-11-161-6/+4
| | | | | Attachment[BUFFER_DEPTH/STENCIL].Renderbuffer. The former may be wrappers around combined depth/stencil renderbuffers attached at the later points.
* Make _mesa_is_proxy_texture() non-static and use in a few more places.Brian Paul2005-11-111-13/+7
| | | | | Use COPY_4FV() where possible. Added some comments, clean-ups.
* minor improvements in _mesa_init_teximage_fields()Brian Paul2005-11-051-9/+9
|
* In gl_texture_image replace IntFormat with InternalFormat and Format withBrian Paul2005-10-051-11/+11
| | | | _BaseFormat to be consistant with gl_renderbuffer.
* additional error checking for GL_EXT_packed_depth_stencilBrian Paul2005-10-011-13/+50
|
* Initial work for GL_EXT_packed_depth_stencil extension.Brian Paul2005-09-281-1/+39
| | | | glReadPixels done, glDrawPixels mostly done.
* New set_fetch_functions() to set a gl_texture_image's FetchTexel functionsBrian Paul2005-09-151-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.
* check for either GL_ARB_depth_texture or GL_SGIX_depth_texture in a few placesBrian Paul2005-09-081-3/+5
|
* The old MESA_PBUFFER_ALLOC() function allocated memory on 512-byte boundaries.Brian Paul2005-07-051-2/+27
| | | | | Restore that behavior with new _mesa_alloc_texmemory() function. Should fix via_sse_memcpy() problem in found with flightgear.
* Get rid of the MESA_PBUFFER_ALLOC/FREE() macros.Brian Paul2005-06-271-1/+1
| | | | | If that stuff is still needed, lots of other updates are needed anyway. Also, some misc MALLOC/FREE -> _mesa_malloc/free() changes.
* add FreeTexImageData hook to help single-copy texturing in driversKeith Whitwell2005-03-221-35/+49
|
* indentation fixBrian Paul2005-02-081-6/+7
|
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-20 04:59:22 +0000