summaryrefslogtreecommitdiffstats
path: root/progs/glsl
Commit message (Collapse)AuthorAgeFilesLines
* demos: add missing dependencies for util filesBrian Paul2009-06-011-10/+11
|
* demos: fix multitex.c VertCoord attribute mappingBrian Paul2009-05-221-1/+16
| | | | | | | | | | | | If the multitex.vert shader uses the VertCoord generic vertex attribute instead of the pre-defined gl_Vertex attribute, we need to make sure that VertCoord gets bound to generic vertex attribute zero. That's because we need to call glVertexAttrib2fv(0, xy) after all the other vertex attributes have been set since setting generic attribute 0 triggers vertex submission. Before, we wound up issuing the vertex attributes in the order 0, 1, 2 which caused the first vertex to be submitted before all the attributes were set. Now, the attributes are set in 1, 2, 0 order.
* progs/glsl: Update ignoreJakob Bornecrantz2009-04-191-0/+3
|
* demos: added glsl/texaaline.c program and overhaul the MakefileBrian Paul2009-04-182-148/+499
|
* demos: move glslnoise.c demo to glsl/noise2.cBrian Paul2009-04-182-0/+209
|
* demos: new glsl/array.c demoBrian Paul2009-04-172-0/+269
| | | | Test variable indexing into a uniform array in a vertex shader.
* demos: set init window size, not posBrian Paul2009-04-161-1/+1
|
* demos: fix aspect ratio in Reshape()Brian Paul2009-04-091-1/+2
|
* progs: IgnoresJakob Bornecrantz2009-04-021-0/+1
|
* demos: added progs/glsl/linktest.c to test linking of separate compilation unitsBrian Paul2009-04-012-0/+265
|
* progs/glsl: IgnoreJakob Bornecrantz2009-03-121-0/+1
|
* demos: add progs/glsl/shadow_sampler.c to test GLSL shadow2D(), etc.Brian Paul2009-02-282-0/+342
| | | | | Heh, I wrote this program a long time ago but just discovered today that it wasn't in git.
* mesa: merge gallium-0.2 into gallium-master-mergeBrian Paul2009-02-097-58/+302
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * progs: IgnoresJakob Bornecrantz2009-01-211-0/+1
| |
| * mesa: add new samplers_array testAlan Hourihane2009-01-142-0/+18
| |
| * mesa: Update .gitignoreYounes Manton2009-01-101-0/+1
| |
| * progs/glsl: Add ignoresJakob Bornecrantz2009-01-051-0/+2
| |
| * progs/glsl: Remove double target def for vert-or-frag-onlyJakob Bornecrantz2009-01-051-1/+0
| |
| * demos: remove redundant Makefile lines from prev mergeBrian2009-01-031-8/+0
| |
| * mesa: replace CC with APP_CC in progs/glsl/MakefileBrian Paul2009-01-021-6/+6
| |
| * Merge commit 'origin/master' into gallium-0.2Brian Paul2009-01-022-0/+365
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/main/ffvertex_prog.c src/mesa/main/texenvprogram.c
| * \ Merge commit 'origin/master' into gallium-0.2Brian Paul2008-12-301-16/+28
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/main/config.h
| * \ \ Merge commit 'origin/master' into gallium-0.2Brian Paul2008-12-191-0/+8
| |\ \ \
| * | | | mesa: s/CC/APP_CC/ in progs/glsl/MakefileBrian Paul2008-12-191-5/+5
| | | | |
| * | | | demos: add test of vertex-only and fragment-only shader programsBrian Paul2008-12-182-0/+200
| | | | |
| * | | | Merge commit 'origin/master' into gallium-0.2Alan Hourihane2008-12-154-0/+284
| |\ \ \ \
| * | | | | fix conflict breakageAlan Hourihane2008-12-081-4/+0
| | | | | |
| * | | | | Merge commit 'origin/master' into gallium-0.2Alan Hourihane2008-12-082-1/+292
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: progs/glsl/Makefile
| * | | | | | mesa: Update some .gitignore files.Younes Manton2008-12-021-0/+1
| | | | | | |
| * | | | | | remove some redundant rules from prev mergeBrian Paul2008-11-241-7/+0
| | | | | | |
| * | | | | | Merge commit 'origin/master' into gallium-0.2Brian Paul2008-11-241-0/+7
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: progs/glsl/Makefile
| * | | | | | | added progs/demos/fragcoord.c - tests gl_FragCoord attribute in fragment shaderBrian Paul2008-11-242-0/+193
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fragment's red/greenb/blue is a function gl_FragCoord.xyz
| * | | | | | | progs: Add ignoresJakob Bornecrantz2008-11-241-0/+2
| | | | | | | |
| * | | | | | | Merge commit 'origin/master' into gallium-0.2Brian Paul2008-11-111-22/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/shader/prog_execute.c src/mesa/shader/slang/library/slang_vertex_builtin_gc.h
| * | | | | | | | use APP_CC, not CC for skinning demoBrian Paul2008-11-051-2/+2
| | | | | | | | |
| * | | | | | | | Merge commit 'origin/master' into gallium-0.2Alan Hourihane2008-11-059-11/+340
| |\ \ \ \ \ \ \ \
| * | | | | | | | | mesa: don't continually redrawBrian Paul2008-10-281-1/+1
| | | | | | | | | |
| * | | | | | | | | replace 1.0/sqrt() with inversesqrt()Brian Paul2008-10-101-1/+1
| | | | | | | | | |
| * | | | | | | | | mesa: use the shaderutil.c helper functionsBrian Paul2008-10-072-84/+17
| | | | | | | | | |
| * | | | | | | | | Progs: hook the glsl identity example into the makefile.Stephane Marchesin2008-10-071-0/+1
| | | | | | | | | |
| * | | | | | | | | Progs: add a trivial glsl test, useful for gallium driver bringup/debug.Stephane Marchesin2008-10-071-0/+282
| | | | | | | | | |
| * | | | | | | | | CELL: mark several transient files as .gitignoreRobert Ellison2008-09-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | progs/demos: added new demo "fbo_firecube" progs/glsl: added new demo "pointcoord" src/gallium/drivers/cell/spu: added the g3d_spu executable, a Cell SPU executable file, which seems to be occasionally built as part of the cell driver src/glu/sgi: added "exptmp", a byproduct of the "mklib" process that sometimes gets deleted and sometimes not.
| * | | | | | | | | use APP_CC, remove redundant targetKeith Whitwell2008-09-121-37/+30
| | | | | | | | | |
| * | | | | | | | | Merge commit 'origin/gallium-0.1' into gallium-0.2Keith Whitwell2008-09-111-5/+4
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile progs/demos/Makefile progs/glsl/Makefile progs/redbook/Makefile progs/samples/Makefile progs/tests/Makefile progs/trivial/Makefile progs/xdemos/Makefile src/gallium/Makefile src/mesa/main/attrib.c src/mesa/main/bufferobj.c src/mesa/vbo/vbo_exec_draw.c
| | * | | | | | | | | define new APP_CC configuration variable for building apps/demos/testsBrian Paul2008-09-111-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For Cell, need to use different compilers for the libraries vs. the demos/tests to avoid strange link error regarding "_Unwind_GetIPInfo@GCC_4.2.0"
| * | | | | | | | | | Merge branch 'gallium-0.1' into gallium-0.2Keith Whitwell2008-09-114-15/+25
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | | | | | add edge detection to that exampleZack Rusin2008-07-211-0/+13
| | | | | | | | | | |
| | * | | | | | | | | add new binaries to ignore to make 'git status' cleanerZack Rusin2008-05-201-0/+1
| | | | | | | | | | |
| | * | | | | | | | | add a simple but nice example of convolution filters in glslZack Rusin2008-05-204-1/+475
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | shows basics of image processing with glsl
| | * | | | | | | | | mesa: call glutDestroyWindow() on exit to help find mem leaksBrian Paul2008-05-161-1/+3
| | | | | | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-19 22:52:56 +0000