summaryrefslogtreecommitdiff
path: root/progs/glsl
AgeCommit message (Collapse)Author
2008-09-11Merge commit 'origin/gallium-0.1' into gallium-0.2Keith Whitwell
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
2008-09-11define new APP_CC configuration variable for building apps/demos/testsBrian Paul
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"
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
2008-08-20use ftransform()Brian Paul
2008-08-16fix convolutions test to consistanty use the ARB shader extension functionsBrian Paul
Was using a mix of the ARB functions and the OpenGL 2.0 shader functions.
2008-08-16remove .txt suffix from shader source filesBrian Paul
2008-08-16mesa: added glsl/convolutions test from gallium branchBrian Paul
2008-08-15draw a tristrip ring instead of a single quadBrian Paul
2008-08-15don't need to use LOD version of texture2D() funcsBrian Paul
2008-08-13mesa: added new glsl/pointcoord.c testBrian Paul
2008-07-21add edge detection to that exampleZack Rusin
2008-06-12Update .gitignore for progs/glslDan Nicholson
2008-05-21added readtex.h dependencyBrian
2008-05-20add new binaries to ignore to make 'git status' cleanerZack Rusin
2008-05-20add a simple but nice example of convolution filters in glslZack Rusin
shows basics of image processing with glsl
2008-05-20new multi-texture GLSL testBrian Paul
2008-05-16mesa: call glutDestroyWindow() on exit to help find mem leaksBrian Paul
2008-04-09more make clean itemsBrian
2008-04-09use InitUniforms()Brian
2008-04-09Replace duplicated code with new shaderutil.c functionsBrian
2008-03-10Ignore more demo programsDan Nicholson
2007-12-18added two-side testBrian
2007-12-18Test GL_VERTEX_PROGRAM_TWO_SIDE and frag shader gl_FrontFacing featuresBrian
2007-12-18added twoside demoBrian
2007-12-04Undo changes made to the toyball shaders in commit ↵Brian
d19d0596daf004b56d80f78fa1a329b43c2ebf94 This demo produces the expected results again.
2007-11-16added z/s keys to reset/step rotationBrian
2007-10-29specify app lib dependencies in Makefiles (patch 1/3)Dan Nicholson
2007-10-26Merge branch '965-glsl'Zou Nan hai
Conflicts: src/mesa/drivers/dri/i965/brw_sf.h src/mesa/drivers/dri/i965/intel_context.c
2007-10-25Ignore generated files.José Fonseca
2007-10-25Ignore new programsDan Nicholson
2007-10-10replace 'brick' with correct program name in printfsBrian
2007-10-10Ignore more generated files in progs/Dan Nicholson
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.
2007-09-28add support for LDFLAGS env varDan Nicholson
2007-08-01triangle rasterization with frag shaderBrian
2007-08-01added trirast programBrian
2007-07-30misc comments, clean-upsBrian
2007-07-29Added shader points and shader bitmap demosBrian
2007-07-17 Fix SOP in fragment shader, brick is ok now.Zou Nan hai
2007-07-17 bumpmap sample is correct nowZou Nan hai
2007-07-04Merge branch 'master' of git+ssh://znh@git.freedesktop.org/git/mesa/mesa ↵Zou Nan hai
into 965-glsl
2007-06-21 support branch and loop in pixel shaderZou Nan hai
most of the sample working with some small modification
2007-05-02get rid of normal vectorBrian
2007-05-02get rid of OSMESA stuffBrian
2007-05-02New test of the dFdx(), dFdy() functions.Brian
2007-02-25add texture rotationBrian
2007-02-25output texcoord in vertex programBrian
2007-02-03shading language texture demo/testBrian
2007-02-03added texdemo1Brian
2007-02-02added newline at endBrian
2007-01-28simple noise testBrian
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-02 19:27:03 +0000