summaryrefslogtreecommitdiff
path: root/progs/util
AgeCommit message (Collapse)AuthorFilesLines
2009-08-30progs/util: minor updates to glutskel.cBrian Paul1-31/+33
2009-08-25progs/util: added ValidateShaderProgram() to shaderutil.cBrian Paul2-0/+23
2009-08-20progs/util: added GetShaderCompile/LinkTime() to get compilation/link timesBrian Paul2-0/+39
2009-08-13progs/util: ignore pre-defined uniforms in SetUniformValues()Brian Paul1-1/+8
2009-08-12progs/glsl: change uniform_info::type field to use GLSL vector typesBrian Paul2-94/+17
2009-08-12demos: rename InitUniforms() to SetUniformValues()Brian Paul2-2/+2
And call new PrintUniforms() in demos.
2009-08-12progs/util: added more shader utility functionsBrian Paul2-19/+200
2009-07-17Merge branch 'mesa_7_5_branch'Brian Paul1-19/+17
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)mesa_7_5Brian Paul1-19/+17
2009-06-30Merge branch 'mesa_7_5_branch'Brian Paul1-1/+6
Conflicts: src/mesa/vbo/vbo_exec_draw.c
2009-06-30progs/util: make sure function pointers are initializedKeith Whitwell1-1/+6
Call Init() from CompileShaderFile, was previously only called for the Text version of this function.
2009-06-15Merge branch 'mesa_7_5_branch'Thomas Hellstrom1-0/+81
Conflicts: progs/util/extfuncs.h
2009-06-12util: additional function pointersBrian Paul1-0/+101
2009-05-22demos/util: add funcs for GL_ARB_buffer_objectBrian Paul1-0/+19
2009-03-16progs: Try to read the texture from the current dir, if full path fails.José Fonseca1-3/+9
2009-02-09mesa: merge gallium-0.2 into gallium-master-mergeBrian Paul2-42/+15
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 Paul1-0/+15
2009-02-01progs: Get more samples building on windows.José Fonseca1-0/+15
2008-12-18util: check for frag/vertShader=0 before attachingBrian Paul1-2/+7
2008-12-17util: check for frag/vertShader=0 before attachingBrian Paul1-2/+7
2008-11-05Merge commit 'origin/master' into gallium-0.2Alan Hourihane1-0/+1
2008-11-04print err msg if unable to open shader fileBrian Paul1-0/+1
2008-09-21Remove CVS keywords.Keith Whitwell4-7/+0
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 Whitwell5-49/+0
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
2008-08-16added test for ARB GLSL extensionsCorbin Simpson1-6/+9
2008-05-26Remove CVS keywords.José Fonseca4-7/+0
2008-04-11add missing glViewport callsBrian Paul1-0/+6
cherry-picked from master
2008-04-11add missing glViewport callsBrian Paul1-0/+6
2008-04-09shader utility functionsBrian2-0/+193
2008-04-04added glGetActiveUniform_funcBrian1-0/+2
2008-04-04mesa: added more ext funcs (from Mesa/master)Brian1-0/+24
2008-02-25Remove files of unsupported build systems.José Fonseca1-42/+0
2008-01-01fix glUniform4f typoBrian1-1/+1
2007-12-18added glSecondaryColor3fv_funcBrian1-0/+3
2007-10-29Rename 'mms-config.' to 'mms.config'.Michal Krol1-1/+1
It looks like Windows does not like filenames ending with a dot, in effect renaming it to 'mms-config'.
2007-07-29added a few more functionsBrian1-0/+19
2007-04-27added glGetActiveAttribmesa_6_5_3Brian1-0/+2
2007-04-08add 2.1 functionsBrian1-0/+14
2007-04-07added glActiveStencilFaceEXTBrian1-0/+4
2007-01-16added some VerteAttrib funcsBrian1-0/+6
2007-01-13added glUniform1fv_func, glUniform2fv_funcBrian1-0/+4
2007-01-09added a few more 2.0 functionsBrian1-0/+8
2007-01-04added glUniform1i_funcBrian1-1/+3
2006-12-20added glUniformMatrix2/3fv_funcBrian1-0/+4
2006-12-15simple extension function wranglerBrian1-0/+94
2006-07-12destroy window upon exit, remove CVS log commentmesa-6_5-20060712Brian Paul1-22/+4
2006-06-26virtual trackball codeBrian Paul2-0/+422
2006-01-31s/malloc/calloc/, fix mem leakBrian Paul1-2/+5
2005-09-23 Committing in .Jouk Jansen1-1/+1
1) change compilation on VMS to use IEEE floating points 2) one more problem with _mesa_sprintf solved Modified Files: Mesa/docs/README.VMS Mesa/progs/demos/descrip.mms Mesa/progs/tests/descrip.mms Mesa/progs/util/descrip.mms Mesa/progs/xdemos/descrip.mms Mesa/src/glu/mesa/descrip.mms Mesa/src/glu/sgi/descrip.mms Mesa/src/glut/glx/descrip.mms Mesa/src/mesa/array_cache/descrip.mms Mesa/src/mesa/drivers/common/descrip.mms Mesa/src/mesa/drivers/osmesa/descrip.mms Mesa/src/mesa/drivers/x11/descrip.mms Mesa/src/mesa/glapi/descrip.mms Mesa/src/mesa/main/descrip.mms Mesa/src/mesa/main/texobj.c Mesa/src/mesa/math/descrip.mms Mesa/src/mesa/shader/descrip.mms Mesa/src/mesa/shader/grammar/descrip.mms Mesa/src/mesa/shader/slang/descrip.mms Mesa/src/mesa/swrast/descrip.mms Mesa/src/mesa/swrast_setup/descrip.mms Mesa/src/mesa/tnl/descrip.mms ----------------------------------------------------------------------
2005-01-11VMS updates from Jouk JansenBrian Paul1-0/+42
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-28 15:27:43 +0000