aboutsummaryrefslogtreecommitdiffstats
path: root/src/mesa/main/teximage.c
Commit message (Collapse)AuthorAgeFilesLines
* mesa: fix state validation bug for glCopyTex[Sub]Image()Brian Paul2009-05-011-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.
* mesa: add new signed rgba texture formatRoland Scheidegger2009-03-281-0/+13
| | | | | This is a (partial) backport of the signed texture format support in OGL 3.1. Since it wasn't promoted from an existing extension roll our own.
* mesa: update/fix doxygen commentsVinson Lee2009-03-171-4/+3
|
* mesa: override_internal_format() function for debug/test purposes (disabled)Brian Paul2009-03-121-0/+49
|
* mesa: improve some error messagesBrian Paul2009-03-121-3/+6
|
* mesa: add support for ATI_envmap_bumpmapRoland Scheidegger2009-03-121-1/+38
| | | | | | | | add new entrypoints, new texture format, etc translate in texenvprogram.c for drivers using the mesa-generated tex env fragment program also handled in swrast, but not tested (cannot work due to negative texel results not handled correctly)
* mesa: use an array for current texture objectsBrian Paul2009-02-211-7/+7
| | | | Use loops to consolidate lots of texture object code.
* Merge commit 'origin/gallium-master-merge'Brian Paul2009-02-101-6/+17
|\ | | | | | | | | | | | | | | | | | | | | | | This is the big merge of the gallium-0.2 branch into master. gallium-master-merge was just the staging area for it. Both gallium-0.2 and gallium-master-merge are considered closed now. Conflicts: progs/demos/Makefile src/mesa/main/state.c src/mesa/main/texenvprogram.c
| * mesa: merge gallium-0.2 into gallium-master-mergeBrian Paul2009-02-091-6/+17
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'origin/gallium-0.2' into gallium-master-merge Conflicts: Makefile docs/relnotes-7.4.html docs/relnotes.html src/mesa/drivers/dri/i965/brw_wm.h src/mesa/main/imports.c src/mesa/main/mtypes.h src/mesa/main/texcompress.c src/mesa/main/texenvprogram.c src/mesa/main/version.h src/mesa/vbo/vbo_exec_api.c src/mesa/vbo/vbo_save_draw.c
| | * Merge commit 'origin/master' into gallium-0.2Brian Paul2008-11-111-18/+18
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/shader/prog_execute.c src/mesa/shader/slang/library/slang_vertex_builtin_gc.h
| | * \ Merge commit 'origin/master' into gallium-0.2Alan Hourihane2008-10-271-59/+67
| | |\ \
| | * \ \ Merge commit 'origin/master' into gallium-0.2Keith Whitwell2008-10-101-10/+8
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/glapi/descrip.mms src/mesa/shader/grammar/descrip.mms
| | * \ \ \ 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...
* | | | | | | mesa: s/_IMAGE_NEW_TRANSFER_STATE/_MESA_NEW_TRANSFER_STATE/ to be more ↵Brian Paul2009-02-101-11/+11
|/ / / / / / | | | | | | | | | | | | | | | | | | consistant with other flags
* | | | | | mesa: minor error msg improvementBrian Paul2009-02-041-1/+2
| | | | | |
* | | | | | mesa: simplify the _mesa_get_proxy_tex_image() functionBrian Paul2009-01-301-85/+30
| | | | | |
* | | | | | mesa: fix incorrect call to clear_teximage_fields() in _mesa_TexImage2D()Brian Paul2009-01-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fixes failed assertion / segfault for particular proxy texture tests.
* | | | | | mesa: fix a render to texture FBO validation bugBrian Paul2009-01-291-10/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When glTexImage() is called we need to re-validate any FBOs that point to the texture (i.e. render-to-texture) since changing the texture's size/format will effect FBO completeness. We don't keep a list of all FBOs rendering into each texture (which would be a bit messy) so we check all FBOs in existance. To optimize this, the gl_texture_object->_RenderToTexture flag is used to avoid checking textures that have never been used as renderbuffers. So, we only walk over all FBOs (there's usually only a few) when glTexImage() modifies a RTT texture. Fixes a bug seen in shadowtex.c when toggling packed depth/stencil mode.
* | | | | | Make GL_ARB_texture_compression mandatoryIan Romanick2009-01-281-17/+15
| |_|_|_|/ |/| | | | | | | | | | | | | | Signed-off-by: Ian Romanick <[email protected]>
* | | | | mesa: new _mesa_is_pow_two() functionBrian2008-11-101-18/+18
| |_|_|/ |/| | |
* | | | mesa: move convolution image adjustment code for glCopyTexSubImage1/2/3D()Brian Paul2008-10-221-15/+21
| | | | | | | | | | | | | | | | Do it after initial error checking, after we know the texture's internal format.
* | | | mesa: some re-org of glCopyTexSubImage1/2/3D() error checkingBrian Paul2008-10-221-33/+32
| | | |
* | | | mesa: in textore.c, only adjust image for convolution if image is a color formatBrian Paul2008-10-221-12/+15
| |_|/ |/| | | | | | | | | | | Makes things consistant with the code in teximage.c. We only want to apply convolution to color formats (not depth/index formats)
* | | Unify ARB_depth_texture and SGIX_depth_textureIan Romanick2008-10-011-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.
* | | Added new _mesa_clip_copytexsubimage() function to do avoid clipping down in ↵Brian2008-09-231-7/+23
| | | | | | | | | | | | | | | | | | | | | the drivers. This should probably be pulled into main-line Mesa... (cherry picked from commit 324ecadbfdf9b944e059832f146451e4151dcb21)
* | | added _mesa_tex_target_to_face()Brian2008-09-211-7/+13
| | | | | | | | | | | | (cherry picked from commit b52ce6341f877a0a1cfd3c50c07eeb1c156ae89e)
* | | mesa: refactor: move #define FEATURE flags into new mfeatures.h fileKeith Whitwell2008-09-211-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
* | 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
|
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-03 08:03:14 +0000