summaryrefslogtreecommitdiffstats
path: root/progs/glsl
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
| * Ignore generated files.José Fonseca2007-10-251-0/+10
| |
* | use ftransform()Brian Paul2008-08-201-1/+1
| |
* | fix convolutions test to consistanty use the ARB shader extension functionsBrian Paul2008-08-161-13/+28
| | | | | | | | Was using a mix of the ARB functions and the OpenGL 2.0 shader functions.
* | remove .txt suffix from shader source filesBrian Paul2008-08-1620-14/+14
| |
* | mesa: added glsl/convolutions test from gallium branchBrian Paul2008-08-164-0/+488
| |
* | draw a tristrip ring instead of a single quadBrian Paul2008-08-151-14/+38
| |
* | don't need to use LOD version of texture2D() funcsBrian Paul2008-08-151-2/+2
| |
* | mesa: added new glsl/pointcoord.c testBrian Paul2008-08-132-0/+213
| |
* | Update .gitignore for progs/glslDan Nicholson2008-06-121-0/+3
| |
* | added readtex.h dependencyBrian2008-05-211-1/+1
| |
* | new multi-texture GLSL testBrian Paul2008-05-204-0/+318
| |
* | more make clean itemsBrian2008-04-091-0/+1
| |
* | use InitUniforms()Brian2008-04-091-24/+1
| |
* | Replace duplicated code with new shaderutil.c functionsBrian2008-04-0912-1075/+200
| |
* | Ignore more demo programsDan Nicholson2008-03-101-1/+2
| |
* | added two-side testBrian2007-12-181-2/+2
| |
* | Test GL_VERTEX_PROGRAM_TWO_SIDE and frag shader gl_FrontFacing featuresBrian2007-12-181-0/+348
| |
* | added twoside demoBrian2007-12-181-1/+2
| |
* | Undo changes made to the toyball shaders in commit ↵Brian2007-12-042-8/+6
| | | | | | | | | | | | d19d0596daf004b56d80f78fa1a329b43c2ebf94 This demo produces the expected results again.
* | added z/s keys to reset/step rotationBrian2007-11-161-2/+12
| |
* | specify app lib dependencies in Makefiles (patch 1/3)Dan Nicholson2007-10-291-2/+4
| |
* | Merge branch '965-glsl'Zou Nan hai2007-10-262-6/+8
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/drivers/dri/i965/brw_sf.h src/mesa/drivers/dri/i965/intel_context.c
| * | Fix SOP in fragment shader, brick is ok now.Zou Nan hai2007-07-171-5/+1
| | |
| * | bumpmap sample is correct nowZou Nan hai2007-07-172-6/+5
| | |
| * | Merge branch 'master' of git+ssh://[email protected]/git/mesa/mesa ↵Zou Nan hai2007-07-042-6/+320
| |\| | | | | | | | | | into 965-glsl
| * | support branch and loop in pixel shaderZou Nan hai2007-06-215-12/+19
| | | | | | | | | | | | most of the sample working with some small modification
* | | Ignore new programsDan Nicholson2007-10-251-0/+3
| | |
* | | replace 'brick' with correct program name in printfsBrian2007-10-104-10/+10
| | |
* | | Ignore more generated files in progs/Dan Nicholson2007-10-101-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | Many of the directories in progs/ were missing .gitignore files or were tracking generated files. This patch is basically the process of running `make' in each directory and then finding the untracked files with `git-ls-files -o --exclude-per-directory=.gitignore'. The existing files were also sorted.
* | | add support for LDFLAGS env varDan Nicholson2007-09-281-2/+2
| | |
* | | triangle rasterization with frag shaderBrian2007-08-011-0/+326
| | |
* | | added trirast programBrian2007-08-011-1/+2
| | |
* | | misc comments, clean-upsBrian2007-07-301-9/+13
| | |
* | | Added shader points and shader bitmap demosBrian2007-07-293-0/+675
| |/ |/|
* | get rid of normal vectorBrian2007-05-021-2/+0
| |
* | get rid of OSMESA stuffBrian2007-05-021-6/+0
| |
* | New test of the dFdx(), dFdy() functions.Brian2007-05-022-0/+322
|/
* add texture rotationBrian2007-02-252-2/+29
|
* output texcoord in vertex programBrian2007-02-251-0/+1
|
* shading language texture demo/testBrian2007-02-035-0/+637
|
* added texdemo1Brian2007-02-031-1/+16
|
* added newline at endBrian2007-02-021-1/+1
|
* simple noise testBrian2007-01-282-0/+297
|
* remove debug codeBrian2007-01-181-4/+0
|
* draw a box, press 'a' to animateBrian2007-01-161-4/+67
|
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-24 08:20:37 +0000