KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,274 Commits 1 Branch 0 Tags 356 MiB
Commit Graph

189 Commits

Author SHA1 Message Date
Dan Nicholson 3a650ba3a2 progs/glsl: Ensure CFLAGS are passed during linking 
Commit ab6825b3e3 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 <dbn.lists@gmail.com>
Tested-by: Török Edwin <edwintorok@gmail.com>
 2010-02-26 11:05:54 -08:00
Török Edvin ab6825b3e3 progs/glsl: add ARCH_FLAGS to LDLIBS 
Allows building 32-bit demos on 64-bit Debian host.

Signed-off-by: Brian Paul <brianp@vmware.com>
 2010-02-25 18:58:55 -07:00
Vinson Lee bbb41153c2 progs/glsl: Fix bump GLSL compilation error on Mac OS. 2010-01-28 14:58:24 -08:00
Vinson Lee 77b1f2fbcf progs/glsl: Remove unused variable in bump.c. 2010-01-28 14:54:10 -08:00
Vinson Lee 07fb52bcf6 progs/glsl: Remove unnecessary header from samplers.c. 2010-01-28 14:22:15 -08:00
Jakob Bornecrantz b01ffb12ed Merge branch 'mesa_7_7_branch' 
Conflicts:
	src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
	src/gallium/auxiliary/util/Makefile
	src/gallium/drivers/r300/r300_state_derived.c
 2010-01-14 22:31:04 +00:00
Vinson Lee 2178abfba3 progs/glsl: Remove duplicate included header from shtest.c. 2010-01-11 19:42:55 -08:00
Brian Paul fd70841121 Merge branch 'mesa_7_7_branch' 
Conflicts:

	src/mesa/drivers/dri/i965/brw_wm_emit.c
 2010-01-08 08:21:12 -07:00
Vinson Lee 223c8482ca progs/glsl: Silence uninitialized variable warning. 2010-01-08 22:10:52 -08:00
Vinson Lee c1dad22d71 progs/glsl: Prevent possible string overflow. 2010-01-06 15:25:42 -08:00
José Fonseca 7bbf7f94ea scons: Build progs together with everything else. 
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
 2010-01-01 12:16:19 +00:00
Brian Paul 25024d9482 Merge branch 'mesa_7_7_branch' 
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
 2009-12-31 09:02:27 -07:00
Vinson Lee 5b2713c92a progs/glsl: Provide a better fix for fgets warning. 2009-12-30 12:38:21 -08:00
Vinson Lee 0ab29d2b35 progs/glsl: Silence compiler warnings. 2009-12-29 21:11:37 -08:00
Brian Paul 9eb7fc6661 Merge branch 'mesa_7_7_branch' 
Conflicts:
	src/mesa/main/version.h
	src/mesa/state_tracker/st_atom_shader.c
 2009-12-21 18:35:54 -07:00
Brian Paul b57abd3bea Merge branch 'mesa_7_6_branch' into mesa_7_7_branch 
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
 2009-12-21 18:23:53 -07:00
Vinson Lee 121ff55d81 progs/glsl: Use C-style comments. 2009-12-18 23:38:15 -08:00
Brian Paul 0311d9ccf4 progs/glsl: updates to deriv.c test 
Pass window size into the shader so scaling the window doesn't effect
the colors.
 2009-12-07 09:03:41 -07:00
Brian Paul 8796dbf519 progs/glsl: added texture mapping to bump demo 
Press 't' to toggle texture map.
 2009-12-07 07:46:02 -07:00
Vinson Lee b1a87a3e0b progs/glsl: Fix memory leak in deriv.c. 
(cherry picked from commit 0e783c7d03)
 2009-12-03 22:54:35 -08:00
Vinson Lee 25fd168f03 progs/glsl: Change tangentAttrib from GLuint to GLint in bump.c. 
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 b8dcb79c53)
 2009-12-03 22:51:43 -08:00
Vinson Lee 9e29242331 progs/glsl: Redraw upon keypress. 
(cherry picked from commit 881f55236a)
 2009-12-03 17:17:24 -08:00
Vinson Lee 0a107d36c2 progs/glsl: Fix trirast GLSL compilation errors on Mac OS. 
(cherry picked from commit 4b3ec2acf2)
 2009-12-02 20:20:12 -08:00
Vinson Lee b094683e7c progs/glsl: Fix noise GLSL compilation error on Mac OS. 
(cherry picked from commit 0d31990b47)
 2009-12-02 20:16:51 -08:00
Vinson Lee 592c8522a2 demos/glsl: Add missing break statement to noise test. 
(cherry picked from commit 7dfea5c072)
 2009-12-02 20:16:41 -08:00
Vinson Lee 8f4d3613da progs/glsl: Fix multinoise GLSL compilation errors on Mac OS. 
(cherry picked from commit d4dc2e30da)
 2009-12-02 20:06:20 -08:00
Vinson Lee 9ed77d12b1 progs/glsl: Add missing break statement in multinoise.c. 
(cherry picked from commit 43080e40aa)
 2009-12-02 20:06:11 -08:00
Vinson Lee 832593772d progs/glsl: Fix mandelbrot GLSL compilation error on Mac OS. 
(cherry picked from commit 04442841fb)
 2009-12-02 19:55:48 -08:00
Vinson Lee 2a5cd95e24 progs/glsl: Include local headers before installed headers during compilation. 
Fixes compilation errors on platforms with insufficient older installed
GL headers.
(cherry picked from commit d17af7d1e1)
 2009-12-02 19:39:25 -08:00
Brian Paul ccea09cd3a progs/glsl: minor Makefile clean-ups 
(cherry picked from commit 4df2f7af5e)
 2009-12-02 19:39:11 -08:00
Vinson Lee 881f55236a progs/glsl: Redraw upon keypress. 2009-11-19 22:46:19 -08:00
Vinson Lee 4b3ec2acf2 progs/glsl: Fix trirast GLSL compilation errors on Mac OS. 2009-11-18 14:02:20 -08:00
Vinson Lee 0d31990b47 progs/glsl: Fix noise GLSL compilation error on Mac OS. 2009-11-18 13:50:49 -08:00
Vinson Lee d4dc2e30da progs/glsl: Fix multinoise GLSL compilation errors on Mac OS. 2009-11-18 12:49:31 -08:00
Vinson Lee 04442841fb progs/glsl: Fix mandelbrot GLSL compilation error on Mac OS. 2009-11-17 23:15:25 -08:00
Brian Paul 89e20ab3ae progs/glsl: use ShadersSupported() 2009-11-17 19:22:29 -07:00
Brian Paul b08f447547 progs/glsl: change //-style comments 2009-11-17 16:16:30 -07:00
Vinson Lee b8dcb79c53 progs/glsl: Change tangentAttrib from GLuint to GLint in bump.c. 
tangentAtrrib is assigned the result of glGetAttribLocation.
The assertion 'assert(tangentAtrrib >= 0)' would be a no-op if
tangentAttrib is a GLuint.
 2009-11-17 11:37:48 -08:00
Vinson Lee 0e783c7d03 progs/glsl: Fix memory leak in deriv.c. 2009-11-17 09:54:54 -08:00
Vinson Lee 43080e40aa progs/glsl: Add missing break statement in multinoise.c. 2009-11-12 16:21:49 -08:00
Vinson Lee 7dfea5c072 demos/glsl: Add missing break statement to noise test. 2009-11-11 17:39:58 -08:00
Brian Paul 55770d09c1 Merge branch 'mesa_7_6_branch' 
Conflicts:

	src/gallium/auxiliary/util/u_cpu_detect.c
 2009-10-05 14:42:08 -06:00
Jon TURNEY a15d9ca9cc Fix building of GLSL demos which use M_PI 
Some <math.h> files do not define M_PI, in which case, provide our own definition

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
 2009-10-05 11:07:23 -06:00
Vinson Lee d17af7d1e1 progs/glsl: Include local headers before installed headers during compilation. 
Fixes compilation errors on platforms with insufficient older installed
GL headers.
 2009-09-21 08:44:56 -06:00
Brian Paul 4df2f7af5e progs/glsl: minor Makefile clean-ups 2009-09-16 19:28:55 -06:00
Brian Paul 7205221051 progs/glsl: asst. changes in shtest.c 2009-08-26 12:16:18 -06:00
Brian Paul 476290946e Merge branch 'mesa_7_5_branch' 2009-08-26 12:01:23 -06:00
Brian Paul 2bcf787de1 progs/glsl: handle window resizes in texaaline.c 2009-08-26 11:56:56 -06:00
Brian Paul 488b3c4d1b progs/glsl: add special Makefile rule for samplers_array 2009-08-26 11:55:15 -06:00
Brian Paul f6d34c2058 progs/glsl: change samplers.c to better test sampler/texture indexing 
Now the left half is yellow and the right half is red, with the gradients
going in opposite directions.
 2009-08-26 11:53:25 -06:00