summaryrefslogtreecommitdiffstats
path: root/progs/glsl/Makefile
Commit message (Collapse)AuthorAgeFilesLines
* demos: import GLSL raytracing demosRALOVICH, Kristóf2010-03-241-1/+3
|
* progs/glsl: Ensure CFLAGS are passed during linkingDan Nicholson2010-02-261-1/+4
| | | | | | | | | | | | Commit ab6825b3e3fd04564b7840e945fa32b0a7b3c0c2 fixed an issue where the architecture option -m32 wasn't being passed to the compiler when linking .o files. This would only fix the issue with user's building with the hacky --enable-32-bit. The right way to fix this is to pass CFLAGS to the linker, which the GNU make builtin rules unfortunately don't do. Signed-off-by: Dan Nicholson <[email protected]> Tested-by: Török Edwin <[email protected]>
* progs/glsl: add ARCH_FLAGS to LDLIBSTörök Edvin2010-02-251-1/+1
| | | | | | Allows building 32-bit demos on 64-bit Debian host. Signed-off-by: Brian Paul <[email protected]>
* progs/glsl: Include local headers before installed headers during compilation.Vinson Lee2009-09-211-1/+1
| | | | | Fixes compilation errors on platforms with insufficient older installed GL headers.
* progs/glsl: minor Makefile clean-upsBrian Paul2009-09-161-8/+7
|
* Merge branch 'mesa_7_5_branch'Brian Paul2009-08-261-0/+4
|\
| * progs/glsl: add special Makefile rule for samplers_arrayBrian Paul2009-08-261-1/+3
| |
* | glsl: re-write Makefile after I called it bad.Dave Airlie2009-08-141-157/+9
| |
* | glsl/tests: skinning.oDave Airlie2009-08-141-2/+2
| | | | | | | | | | worst Makefile ever. not sure what is going on here, hopefully this fixes tinderbox
* | progs/glsl: new shtest program, a simple shader test harness appBrian Paul2009-08-131-2/+8
|/ | | | This commit includes some sample config files (*.shtest)
* progs/glsl: link with GLEW libraryBrian Paul2009-06-291-1/+1
|
* demos: add missing dependencies for util filesBrian Paul2009-06-011-10/+11
|
* demos: added glsl/texaaline.c program and overhaul the MakefileBrian Paul2009-04-181-148/+130
|
* demos: move glslnoise.c demo to glsl/noise2.cBrian Paul2009-04-181-0/+8
|
* demos: new glsl/array.c demoBrian Paul2009-04-171-0/+8
| | | | Test variable indexing into a uniform array in a vertex shader.
* demos: added progs/glsl/linktest.c to test linking of separate compilation unitsBrian Paul2009-04-011-0/+7
|
* demos: add progs/glsl/shadow_sampler.c to test GLSL shadow2D(), etc.Brian Paul2009-02-281-0/+1
| | | | | Heh, I wrote this program a long time ago but just discovered today that it wasn't in git.
* mesa: add new samplers_array testAlan Hourihane2009-01-141-0/+6
|
* 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-021-0/+8
|\ | | | | | | | | | | | | Conflicts: src/mesa/main/ffvertex_prog.c src/mesa/main/texenvprogram.c
| * demos: added progs/glsl/samplers.c to test all available texture samplersBrian Paul2009-01-011-0/+8
| |
* | Merge commit 'origin/master' into gallium-0.2Brian Paul2008-12-191-0/+8
|\|
| * demos: add test of vertex-only and fragment-only shader programsBrian Paul2008-12-171-0/+9
| |
* | 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-181-0/+9
| |
* | Merge commit 'origin/master' into gallium-0.2Alan Hourihane2008-12-151-0/+1
|\|
| * Add "multinoise" demo, to test 1/2/3/4 dimensional noise.Gary Wong2008-12-131-0/+1
| |
* | fix conflict breakageAlan Hourihane2008-12-081-4/+0
| |
* | Merge commit 'origin/master' into gallium-0.2Alan Hourihane2008-12-081-1/+13
|\| | | | | | | | | | | Conflicts: progs/glsl/Makefile
| * demos: added simple vertex shader texture test.Brian2008-12-031-1/+8
| | | | | | | | Draw a quadmesh where Z coord is taken from a texture map.
* | 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-211-0/+8
| | | | | | | | Fragment's red/greenb/blue is a function gl_FragCoord.xyz
* | added progs/demos/fragcoord.c - tests gl_FragCoord attribute in fragment shaderBrian Paul2008-11-241-0/+8
| | | | | | | | Fragment's red/greenb/blue is a function gl_FragCoord.xyz
* | use APP_CC, not CC for skinning demoBrian Paul2008-11-051-2/+2
| |
* | Merge commit 'origin/master' into gallium-0.2Alan Hourihane2008-11-051-0/+8
|\|
| * added glsl/skinning.c test to test matrix blending/weightingBrian Paul2008-11-041-0/+8
| |
* | mesa: use the shaderutil.c helper functionsBrian Paul2008-10-071-0/+7
| |
* | Progs: hook the glsl identity example into the makefile.Stephane Marchesin2008-10-071-0/+1
| |
* | 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-111-1/+7
|\| | | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 a simple but nice example of convolution filters in glslZack Rusin2008-05-201-1/+8
| | | | | | | | shows basics of image processing with glsl
* | mesa: added glsl/convolutions test from gallium branchBrian Paul2008-08-161-0/+8
| |
* | mesa: added new glsl/pointcoord.c testBrian Paul2008-08-131-0/+8
| |
* | added readtex.h dependencyBrian2008-05-211-1/+1
| |
* | new multi-texture GLSL testBrian Paul2008-05-201-0/+8
| |
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-27 18:29:32 +0000