summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/texstore.c
Commit message (Collapse)AuthorAgeFilesLines
* mesa: fixes for srgb, new srgb formatsRoland Scheidegger2008-12-121-19/+32
| | | | | | | | | | | add some more srgb texture formats, including compressed ones various fixes relating to srgb formats issues: _mesa_get_teximage is completely broken for srgb textures, both for non-compressed ones (swizzling) and compressed ones (shouldn't do standard-to-linear conversion) texelFetch function may be broken for little or big endian (or both...)
* Merge commit 'origin/master' into gallium-0.2Alan Hourihane2008-11-201-1/+9
|\
| * mesa: clamp luminance if needed.Xiang, Haihao2008-11-191-1/+9
| | | | | | | | | | This fixes glReadPixels(GL_LUMINANCE, GL_FLOAT)/glGetTexImage(GL_LUMINANCE, GL_FLOAT) issue on fixed-point color buffers.
* | Merge commit 'origin/master' into gallium-0.2Alan Hourihane2008-10-271-14/+6
|\|
| * mesa: remove calls to _mesa_adjust_image_for_convolution(), use texImage fieldsBrian Paul2008-10-231-14/+6
| | | | | | | | The texImage->Width/Height fields will have the post-convolution width/height.
| * mesa: in textore.c, only adjust image for convolution if image is a color formatBrian Paul2008-10-221-2/+2
| | | | | | | | | | Makes things consistant with the code in teximage.c. We only want to apply convolution to color formats (not depth/index formats)
* | Merge commit 'origin/master' into gallium-0.2Brian Paul2008-10-101-40/+10
|\|
| * mesa: fix asst. issues in _mesa_texstore_argb8888()Brian Paul2008-10-101-40/+10
| | | | | | | | | | | | | | | | If we shift bytes into the texel word (or use the PACK_COLOR_8888 macro), we don't have to worry about big vs. little endian. See comments about texel formats in texformat.h. Remove an unneeded/incorrect else-if clause that produced wrong results on big-endian systems.
* | Merge branch 'master' into gallium-0.2Keith Whitwell2008-09-211-1/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/glapi/glapi.h src/mesa/main/api_exec.c src/mesa/main/attrib.c src/mesa/main/clear.c src/mesa/main/context.c src/mesa/main/mfeatures.h src/mesa/main/mipmap.c src/mesa/main/mipmap.h src/mesa/main/readpix.c src/mesa/main/sources src/mesa/main/state.c src/mesa/main/texformat.c src/mesa/main/texparam.c src/mesa/main/texstate.c src/mesa/vbo/vbo_context.c src/mesa/x86/common_x86_asm.S
| * mesa: fix some pixel transfer state tests for depth formatsBrian Paul2008-09-211-5/+9
| | | | | | | | (cherry picked from commit 966e199e409a1b52eef88e48997442250997f45e)
| * mesa: Silence compiler warnings on Windows.Michal Krol2008-09-211-1/+1
| |
| * mesa: refactor: move #define FEATURE flags into new mfeatures.h fileKeith Whitwell2008-09-211-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/mesa into ↵Alan Hourihane2008-09-111-4/+3
|\| | | | | | | | | | | | | | | | | | | | | gallium-0.2 Conflicts: src/mesa/drivers/dri/i915/intel_ioctl.c src/mesa/main/texstore.c src/mesa/tnl/t_vp_build.c src/mesa/vbo/vbo_exec_draw.c
| * mesa: merge stencil values into depth values for MESA_FORMAT_S8_Z24Xiang, Haihao2008-09-041-2/+2
| |
| * mesa: Support for MESA_FORMAT_S8_Z24 textureJakob Bornecrantz2008-09-041-0/+81
| | | | | | | | cherry-picked from gallium-0.1
* | Merge branch 'gallium-0.1' into gallium-0.2Keith Whitwell2008-09-111-7/+107
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: fix some pixel transfer state tests for depth formatsBrian Paul2008-08-081-5/+9
| |
| * mesa: fix out-of-bounds memory reads in swizzle_copy()Brian Paul2008-08-081-29/+89
| |
| * mesa: fix issues causing warnings on WindowsBrian Paul2008-07-251-7/+4
| |
| * mesa: Mark as XXX unresolved warnings on windows.Michal Krol2008-07-251-0/+5
| |
| * mesa: Silence compiler warnings on Windows.Michal Krol2008-07-151-1/+1
| |
| * mesa: Move variable declarations to the scope top.José Fonseca2008-06-241-5/+4
| |
| * mesa: Fix bug in _mesa_swizzle_ubyte_imageBrian Paul2008-06-181-1/+2
| |
| * mesa: _mesa_texstore_s8_z24 now supports depth only uploadsJakob Bornecrantz2008-06-181-34/+62
| |
| * mesa: Added _mesa_texstore_s8_z24Jakob Bornecrantz2008-06-181-0/+54
| |
| * mesa: fix inconsistent use of GL_UNSIGNED_INT vs. GL_UNSIGNED_INT_24_8_EXT ↵Brian Paul2008-06-171-2/+2
| | | | | | | | for Z unpacking
| * mesa: refactor: move #define FEATURE flags into new mfeatures.h fileBrian Paul2008-06-101-1/+16
| | | | | | | | Also, check the FEATURE flags in many places.
| * Remove unused texunit parameter to ctx->Driver.GenerateMipmap()Brian2008-02-081-24/+8
| |
| * Added ctx->Driver.GenerateMipmap() driver hookBrian2008-02-061-24/+24
| |
| * Fix endianness bug in _mesa_texstore_argb8888()Brian2007-12-051-13/+15
| | | | | | | | | | On big-endian, storing in _mesa_texformat_argb8888 format produced wrong results. Also, clean-up nearby code to match.
* | mesa: fix out-of-bounds memory reads in swizzle_copy()Brian Paul2008-08-081-30/+90
| |
* | mesa: fix issues causing warnings on WindowsBrian Paul2008-07-291-2/+4
| |
* | mesa: fix inconsistent use of GL_UNSIGNED_INT vs. GL_UNSIGNED_INT_24_8_EXT ↵Brian Paul2008-06-171-2/+2
| | | | | | | | for Z unpacking
* | Remove unused texunit parameter to ctx->Driver.GenerateMipmap()Brian2008-05-091-24/+8
| | | | | | | | (cherry picked from commit c3395f4473c8fdf75d04c0dd72e687bc8d8127a7)
* | Added ctx->Driver.GenerateMipmap() driver hookDave Airlie2008-05-091-24/+24
| | | | | | | | | | | | | | | | (cherry picked from commit 4c2f3dbca940f289e67248682b84a3516d5a3031) Conflicts: src/mesa/drivers/common/driverfuncs.c
* | Change GetCompressedTexImage in dd_function_table to not take const pointers.Kristian Høgsberg2008-02-251-2/+2
| | | | | | | | | | They're changed by the intel driver implementation and thus not const. Fixes compilation warning.
* | _mesa_swizzle_ubyt_image: Don't use single swizzle_copy callXiang, Haihao2008-02-131-0/+1
| | | | | | | | if components don't match. fix #13508
* | Fix endianness bug in _mesa_texstore_argb8888()Brian2007-12-051-11/+13
|/ | | | | | | On big-endian, storing in _mesa_texformat_argb8888 format produced wrong res Also, clean-up nearby code to match. picked from gallium-0.1 branch
* Change float depthScale param to _mesa_unpack_depth_span() to GLuint depthMax.Brian2007-07-081-3/+5
|
* i915tex: Make sure texture format fetch hooks are initialized.Michel Dänzer2007-04-091-3/+3
|
* mesa: revert f9f79c8d770e696249bd98c68b563f887562c974Xiang, Haihao2007-03-211-1/+1
| | | | | | | to fix #10232 Table6.1(in gl2.1) has been applied for glGetTexImage before calling into _mesa_pack_rgba_span_float.
* fix some format conversion bugs in glGetTexImage(), bug 10288Haihao Xiang2007-03-171-0/+19
|
* New IMAGE_RED_TO_LUMINANCE flag passed to _mesa_pack_rgba_span_float() to ↵Brian2007-03-091-1/+1
| | | | fix glGetTexImage(GL_LUMINANCE) bug #10232.
* _mesa_swizzle_ubyte_image: Only use single swizzle_copy call when strides match.Michel Dänzer2006-12-141-1/+2
| | | | | This fixes texture data corruption with glTexSubimage (and probably glTexImage under some circumstances) with the texstore swizzle path.
* comment about a valgrind errorBrian Paul2006-11-021-0/+1
|
* In _mesa_pack_rgba_span_float() we don't need to make a temporary copy ofBrian Paul2006-10-131-5/+4
| | | | | | | incoming colors when applying pixel transfer ops. In all cases, the caller either indicates there's no pixel transfer ops, or the incoming colors are coming from temporary storage already and can be safely modified.
* Move mipmap generation functions, texture scaling functions into newBrian Paul2006-09-291-1114/+7
| | | | mipmap.c file.
* Fix and re-enable swizzling paths for big endian platforms.Michel Dänzer2006-09-251-12/+10
|
* replace assert(0) with error report, improved comments, etcBrian Paul2006-09-211-16/+27
|
* Fix incorrect byteswap_mapping(). Disable swizzle path on bigEndianKeith Whitwell2006-09-211-24/+25
| | | | until someone can figure out whats wrong there.
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-02 10:23:41 +0000