summaryrefslogtreecommitdiff
path: root/progs/util
AgeCommit message (Collapse)Author
2010-05-21Remove demos that have moved to git+ssh://git.freedesktop.org/git/mesa/demos.Eric Anholt
The remaining programs are ones I've had difficulty finding a build environment for to make the build system or are unit tests that should probably live next to their code instead. Hopefully people can bring over the build for remaining pieces they care about.
2009-12-27Merge branch 'mesa_7_6_branch' into mesa_7_7_branchBrian Paul
Conflicts: src/gallium/auxiliary/util/u_network.c src/gallium/auxiliary/util/u_network.h src/gallium/drivers/i915/i915_state.c src/gallium/drivers/trace/tr_rbug.c src/gallium/state_trackers/vega/bezier.c src/gallium/state_trackers/vega/vg_context.c src/gallium/state_trackers/xorg/xorg_crtc.c src/gallium/state_trackers/xorg/xorg_driver.c src/gallium/winsys/xlib/xlib_brw_context.c src/mesa/main/mtypes.h
2009-12-25progs/util: Silence warn_unused_result warnings.Vinson Lee
2009-12-10progs/util: Byte swap individual members of struct _rawImageRec.Vinson Lee
2009-12-04progs/util: Fix memory leak if fread returns 0 in CompileShaderFile.Vinson Lee
(cherry picked from commit 11905da8836822f7dd60c84b5eefc72e46c94b50)
2009-12-04progs/util: Fix memory leak if fail to load/compile shaderVinson Lee
Signed-off-by: Brian Paul <brianp@vmware.com> (cherry picked from commit c475079ef2d901ba4506ebd53e19419cd46793ab)
2009-12-03progs/util: Exit RawImageGetData early if malloc fails.Vinson Lee
Prevents a null pointer deference later on. (cherry picked from commit e26135a744f740430e3dc341fa692544ba99c11e)
2009-12-03progs/util: Fix memory leak if malloc fails in RawImageOpen.Vinson Lee
(cherry picked from commit d36cb2396c942f05ba56c5b899792a507bb0f0fd)
2009-12-03progs/util: Fix memory leak if fopen fails in RawImageOpen.Vinson Lee
(cherry picked from commit d9508e8df9da4aa13bc223194c406081738bac91)
2009-12-03progs/util: Fix memory leak if malloc fails in tkRGBImageLoad.Vinson Lee
(cherry picked from commit 786d539511eb3c5a4101b11b7f8e90d60123ac46)
2009-12-03progs/util: Fix memory leak if LoadRGBImage fails.Vinson Lee
(cherry picked from commit 041cd0e110d41b543a0fe9cc484ae8373642912b)
2009-12-03progs/util: Fix memory if LoadRGBMipmaps2 fails.Vinson Lee
(cherry picked from commit 28b8e4bcd76cc072b062e4c8575327c05ecb9a55)
2009-12-03progs/util: Fix memory leak if LoadYUVImage fails.Vinson Lee
(cherry picked from commit 0e790ac35327a0b53a4a595a6429135317302269)
2009-11-23shaderutil: Fix detection of shadersIan Romanick
Check for versions >= 2.0 (because some drivers return 3.0), and return GL_FALSE if shaders are not detected.
2009-08-30progs/util: minor updates to glutskel.cBrian Paul
2009-08-25progs/util: added ValidateShaderProgram() to shaderutil.cBrian Paul
2009-08-20progs/util: added GetShaderCompile/LinkTime() to get compilation/link timesBrian Paul
2009-08-13progs/util: ignore pre-defined uniforms in SetUniformValues()Brian Paul
2009-08-12progs/glsl: change uniform_info::type field to use GLSL vector typesBrian Paul
2009-08-12demos: rename InitUniforms() to SetUniformValues()Brian Paul
And call new PrintUniforms() in demos.
2009-08-12progs/util: added more shader utility functionsBrian Paul
2009-12-11Merge branch 'mesa_7_6_branch' into mesa_7_7_branchBrian Paul
2009-11-30Merge branch 'mesa_7_6_branch' into mesa_7_7_branchIan Romanick
Conflicts: progs/util/shaderutil.c src/mesa/drivers/dri/r600/r600_context.c src/mesa/main/version.h
2009-11-20progs/util: Exit RawImageGetData early if malloc fails.Vinson Lee
Prevents a null pointer deference later on.
2009-11-20progs/util: Fix memory leak if malloc fails in RawImageOpen.Vinson Lee
2009-11-17progs/util: warn when GLSL not supportedBrian Paul
2009-11-17progs/util: Fix memory leak if fopen fails in RawImageOpen.Vinson Lee
2009-11-17progs/util: Fix memory leak if fread returns 0 in CompileShaderFile.Vinson Lee
2009-11-17progs/util: Fix memory leak if malloc fails in tkRGBImageLoad.Vinson Lee
2009-11-17progs/util: Fix memory leak if LoadRGBImage fails.Vinson Lee
2009-11-17progs/util: Fix memory if LoadRGBMipmaps2 fails.Vinson Lee
2009-11-16progs/util: Fix memory leak if LoadYUVImage fails.Vinson Lee
2009-11-03progs/util: Fix memory leak if fail to load/compile shaderVinson Lee
Signed-off-by: Brian Paul <brianp@vmware.com>
2009-07-17Merge branch 'mesa_7_5_branch'Brian Paul
Conflicts: Makefile progs/glsl/multitex.c src/mesa/main/enums.c src/mesa/main/state.c src/mesa/main/texenvprogram.c src/mesa/main/version.h
2009-07-17progs/util: remove extfuncs.h (we use GLEW instead)Brian Paul
2009-06-30Merge branch 'mesa_7_5_branch'Brian Paul
Conflicts: src/mesa/vbo/vbo_exec_draw.c
2009-06-30progs/util: make sure function pointers are initializedKeith Whitwell
Call Init() from CompileShaderFile, was previously only called for the Text version of this function.
2009-06-15Merge branch 'mesa_7_5_branch'Thomas Hellstrom
Conflicts: progs/util/extfuncs.h
2009-06-12util: additional function pointersBrian Paul
2009-05-22demos/util: add funcs for GL_ARB_buffer_objectBrian Paul
2009-03-16progs: Try to read the texture from the current dir, if full path fails.José Fonseca
2009-02-09mesa: merge gallium-0.2 into gallium-master-mergeBrian Paul
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
2009-02-02util: added more functions to extfuncs.hBrian Paul
2009-02-01progs: Get more samples building on windows.José Fonseca
2008-12-18util: check for frag/vertShader=0 before attachingBrian Paul
2008-12-17util: check for frag/vertShader=0 before attachingBrian Paul
2008-11-05Merge commit 'origin/master' into gallium-0.2Alan Hourihane
2008-11-04print err msg if unable to open shader fileBrian Paul
2008-09-21Remove CVS keywords.Keith Whitwell
Cherry-picked from gallium-0.1 Conflicts: src/glu/sgi/libnurbs/interface/bezierEval.h src/glu/sgi/libnurbs/interface/bezierPatch.h src/glu/sgi/libnurbs/interface/bezierPatchMesh.h src/glu/sgi/libnurbs/internals/dataTransform.h src/glu/sgi/libnurbs/internals/displaymode.h src/glu/sgi/libnurbs/internals/sorter.h src/glu/sgi/libnurbs/nurbtess/definitions.h src/glu/sgi/libnurbs/nurbtess/directedLine.h src/glu/sgi/libnurbs/nurbtess/gridWrap.h src/glu/sgi/libnurbs/nurbtess/monoChain.h src/glu/sgi/libnurbs/nurbtess/monoPolyPart.h src/glu/sgi/libnurbs/nurbtess/monoTriangulation.h src/glu/sgi/libnurbs/nurbtess/partitionX.h src/glu/sgi/libnurbs/nurbtess/partitionY.h src/glu/sgi/libnurbs/nurbtess/polyDBG.h src/glu/sgi/libnurbs/nurbtess/polyUtil.h src/glu/sgi/libnurbs/nurbtess/primitiveStream.h src/glu/sgi/libnurbs/nurbtess/quicksort.h src/glu/sgi/libnurbs/nurbtess/rectBlock.h src/glu/sgi/libnurbs/nurbtess/sampleComp.h src/glu/sgi/libnurbs/nurbtess/sampleCompBot.h src/glu/sgi/libnurbs/nurbtess/sampleCompRight.h src/glu/sgi/libnurbs/nurbtess/sampleCompTop.h src/glu/sgi/libnurbs/nurbtess/sampleMonoPoly.h src/glu/sgi/libnurbs/nurbtess/sampledLine.h src/glu/sgi/libnurbs/nurbtess/searchTree.h src/glu/sgi/libnurbs/nurbtess/zlassert.h src/glu/sgi/libutil/error.c src/glu/sgi/libutil/glue.c src/glu/sgi/libutil/gluint.h src/glu/sgi/libutil/project.c src/glu/sgi/libutil/registry.c src/glx/x11/glxclient.h src/glx/x11/glxext.c src/mesa/drivers/dri/ffb/ffb_dd.h src/mesa/drivers/dri/ffb/ffb_points.h src/mesa/drivers/dri/gamma/gamma_context.h src/mesa/drivers/dri/gamma/gamma_macros.h src/mesa/drivers/dri/i810/i810context.h src/mesa/drivers/dri/r128/r128_dd.h src/mesa/drivers/dri/tdfx/tdfx_dd.h
2008-09-11Merge branch 'gallium-0.1' into gallium-0.2Keith Whitwell
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
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-26 08:45:42 +0000