Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | progs/glsl: Update .gitignore. | Vinson Lee | 2010-04-10 | 1 | -0/+2 |
| | |||||
* | progs/glsl: Add workarounds for Apple GLSL compiler crash. | Vinson Lee | 2010-03-29 | 2 | -0/+14 |
| | | | | | | fsraytrace and vsraytrace were crashing on Mac OS X 10.6.3 in the Apple GLSL compiler function TPPStreamCompiler::assignOperands. Removing some const qualifers made the crashes go away. | ||||
* | progs/glsl: Remove inline keyword. | Vinson Lee | 2010-03-29 | 2 | -6/+6 |
| | | | | Fixes MSVC build. | ||||
* | progs/glsl: improve the mouse drag/rotate code a little | Brian Paul | 2010-03-29 | 2 | -11/+7 |
| | |||||
* | progs/glsl: let the mouse rotate the scene | RALOVICH, Kristóf | 2010-03-29 | 2 | -31/+83 |
| | |||||
* | progs/glsl: Fix vsraytrace GLSL compilation error. | Vinson Lee | 2010-03-24 | 1 | -1/+1 |
| | | | | | Fixes the following GLSL error on Mac OS X. '=' : assigning non-constant to 'const 3-component vector of float' | ||||
* | progs/glsl: Add raytracing demos to SCons build. | Vinson Lee | 2010-03-24 | 1 | -0/+2 |
| | |||||
* | progs/glsl: remove/replace //-style comments | Brian Paul | 2010-03-24 | 2 | -3/+2 |
| | |||||
* | progs/glsl: silence warnings, remove debug code, adjust window size, etc | Brian Paul | 2010-03-24 | 2 | -31/+35 |
| | |||||
* | demos: import GLSL raytracing demos | RALOVICH, Kristóf | 2010-03-24 | 3 | -1/+751 |
| | |||||
* | progs/glsl: Ensure CFLAGS are passed during linking | Dan Nicholson | 2010-02-26 | 1 | -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 LDLIBS | Török Edvin | 2010-02-25 | 1 | -1/+1 |
| | | | | | | Allows building 32-bit demos on 64-bit Debian host. Signed-off-by: Brian Paul <[email protected]> | ||||
* | progs/glsl: Fix bump GLSL compilation error on Mac OS. | Vinson Lee | 2010-01-28 | 1 | -1/+1 |
| | |||||
* | progs/glsl: Remove unused variable in bump.c. | Vinson Lee | 2010-01-28 | 1 | -1/+0 |
| | |||||
* | progs/glsl: Remove unnecessary header from samplers.c. | Vinson Lee | 2010-01-28 | 1 | -1/+0 |
| | |||||
* | Merge branch 'mesa_7_7_branch' | Jakob Bornecrantz | 2010-01-14 | 2 | -2/+1 |
|\ | | | | | | | | | | | | | Conflicts: src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c src/gallium/auxiliary/util/Makefile src/gallium/drivers/r300/r300_state_derived.c | ||||
| * | progs/glsl: Remove duplicate included header from shtest.c. | Vinson Lee | 2010-01-11 | 1 | -1/+0 |
| | | |||||
| * | progs/glsl: Silence uninitialized variable warning. | Vinson Lee | 2010-01-08 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'mesa_7_7_branch' | Brian Paul | 2010-01-08 | 1 | -0/+4 |
|\| | | | | | | | | | | | Conflicts: src/mesa/drivers/dri/i965/brw_wm_emit.c | ||||
| * | progs/glsl: Prevent possible string overflow. | Vinson Lee | 2010-01-06 | 1 | -0/+4 |
| | | |||||
* | | scons: Build progs together with everything else. | José Fonseca | 2010-01-01 | 1 | -19/+1 |
| | | | | | | | | | | | | | | | | This is a substantial reorganization, This particular commit enables: - building the progs for unices platforms - glew is now built as a shared library (it is the default, and it is inconvenient and pointless to shift away from that default) - all progs get built by default | ||||
* | | Merge branch 'mesa_7_7_branch' | Brian Paul | 2009-12-31 | 2 | -12/+2 |
|\| | | | | | | | | | | | | | | | Conflicts: configs/darwin src/gallium/auxiliary/util/u_clear.h src/gallium/state_trackers/xorg/xorg_exa_tgsi.c src/mesa/drivers/dri/i965/brw_draw_upload.c | ||||
| * | progs/glsl: Provide a better fix for fgets warning. | Vinson Lee | 2009-12-30 | 1 | -5/+2 |
| | | |||||
| * | progs/glsl: Silence compiler warnings. | Vinson Lee | 2009-12-29 | 2 | -10/+3 |
| | | |||||
* | | Merge branch 'mesa_7_7_branch' | Brian Paul | 2009-12-21 | 2 | -5/+3 |
|\| | | | | | | | | | | | Conflicts: src/mesa/main/version.h src/mesa/state_tracker/st_atom_shader.c | ||||
| * | Merge branch 'mesa_7_6_branch' into mesa_7_7_branch | Brian Paul | 2009-12-21 | 2 | -5/+3 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac progs/demos/morph3d.c progs/demos/textures.c progs/glsl/shtest.c progs/glsl/texaaline.c progs/tests/packedpixels.c progs/xdemos/corender.c src/mesa/main/version.h | ||||
| | * | progs/glsl: Use C-style comments. | Vinson Lee | 2009-12-18 | 2 | -3/+3 |
| | | | |||||
| | * | progs/glsl: Fix memory leak in deriv.c. | Vinson Lee | 2009-12-03 | 1 | -0/+1 |
| | | | | | | | | | | | | (cherry picked from commit 0e783c7d03128aade3ca50b28a56e254fef6b6ab) | ||||
| | * | progs/glsl: Change tangentAttrib from GLuint to GLint in bump.c. | Vinson Lee | 2009-12-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | tangentAtrrib is assigned the result of glGetAttribLocation. The assertion 'assert(tangentAtrrib >= 0)' would be a no-op if tangentAttrib is a GLuint. (cherry picked from commit b8dcb79c53796f37234bd2b0f5e2845f817fc218) | ||||
| | * | progs/glsl: Redraw upon keypress. | Vinson Lee | 2009-12-03 | 1 | -1/+1 |
| | | | | | | | | | | | | (cherry picked from commit 881f55236ad85f95745e70f8363726fa3c201f80) | ||||
| | * | progs/glsl: Fix trirast GLSL compilation errors on Mac OS. | Vinson Lee | 2009-12-02 | 1 | -3/+3 |
| | | | | | | | | | | | | (cherry picked from commit 4b3ec2acf2cc2830b0907e4fb4db8bd1ff4a18e3) | ||||
| | * | progs/glsl: Fix noise GLSL compilation error on Mac OS. | Vinson Lee | 2009-12-02 | 1 | -1/+1 |
| | | | | | | | | | | | | (cherry picked from commit 0d31990b4742eccdf6ae6a3b3e16c81cc863085d) | ||||
| | * | demos/glsl: Add missing break statement to noise test. | Vinson Lee | 2009-12-02 | 1 | -0/+1 |
| | | | | | | | | | | | | (cherry picked from commit 7dfea5c0722e9da101805c15b9dd26352816bca9) | ||||
| | * | progs/glsl: Fix multinoise GLSL compilation errors on Mac OS. | Vinson Lee | 2009-12-02 | 1 | -5/+5 |
| | | | | | | | | | | | | (cherry picked from commit d4dc2e30dada1be425e95ba270920db6eb210982) | ||||
| | * | progs/glsl: Add missing break statement in multinoise.c. | Vinson Lee | 2009-12-02 | 1 | -0/+1 |
| | | | | | | | | | | | | (cherry picked from commit 43080e40aa0d34423e10f1d50aad15289b2b9aec) | ||||
| | * | progs/glsl: Fix mandelbrot GLSL compilation error on Mac OS. | Vinson Lee | 2009-12-02 | 1 | -1/+1 |
| | | | | | | | | | | | | (cherry picked from commit 04442841fb7e9138eb50ff692952ad7e8c3877d8) | ||||
| | * | progs/glsl: Include local headers before installed headers during compilation. | Vinson Lee | 2009-12-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | Fixes compilation errors on platforms with insufficient older installed GL headers. (cherry picked from commit d17af7d1e19e637e29db47bd8f6e3e579760c530) | ||||
| | * | progs/glsl: minor Makefile clean-ups | Brian Paul | 2009-12-02 | 1 | -8/+7 |
| | | | | | | | | | | | | (cherry picked from commit 4df2f7af5e9b2c00ead92fe0ae49ed8491aef1d0) | ||||
* | | | progs/glsl: updates to deriv.c test | Brian Paul | 2009-12-07 | 1 | -2/+13 |
| | | | | | | | | | | | | | | | Pass window size into the shader so scaling the window doesn't effect the colors. | ||||
* | | | progs/glsl: added texture mapping to bump demo | Brian Paul | 2009-12-07 | 2 | -2/+100 |
|/ / | | | | | | | Press 't' to toggle texture map. | ||||
* | | progs/glsl: Redraw upon keypress. | Vinson Lee | 2009-11-19 | 1 | -1/+1 |
| | | |||||
* | | progs/glsl: Fix trirast GLSL compilation errors on Mac OS. | Vinson Lee | 2009-11-18 | 1 | -3/+3 |
| | | |||||
* | | progs/glsl: Fix noise GLSL compilation error on Mac OS. | Vinson Lee | 2009-11-18 | 1 | -1/+1 |
| | | |||||
* | | progs/glsl: Fix multinoise GLSL compilation errors on Mac OS. | Vinson Lee | 2009-11-18 | 1 | -5/+5 |
| | | |||||
* | | progs/glsl: Fix mandelbrot GLSL compilation error on Mac OS. | Vinson Lee | 2009-11-17 | 1 | -1/+1 |
| | | |||||
* | | progs/glsl: use ShadersSupported() | Brian Paul | 2009-11-17 | 2 | -10/+4 |
| | | |||||
* | | progs/glsl: change //-style comments | Brian Paul | 2009-11-17 | 2 | -3/+5 |
| | | |||||
* | | progs/glsl: Change tangentAttrib from GLuint to GLint in bump.c. | Vinson Lee | 2009-11-17 | 1 | -1/+1 |
| | | | | | | | | | | | | tangentAtrrib is assigned the result of glGetAttribLocation. The assertion 'assert(tangentAtrrib >= 0)' would be a no-op if tangentAttrib is a GLuint. | ||||
* | | progs/glsl: Fix memory leak in deriv.c. | Vinson Lee | 2009-11-17 | 1 | -0/+1 |
| | | |||||
* | | progs/glsl: Add missing break statement in multinoise.c. | Vinson Lee | 2009-11-12 | 1 | -0/+1 |
| | |