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

1847 Commits

Author SHA1 Message Date
Keith Whitwell a5585cb533 Merge commit 'origin/master' into i965g-restart 
Conflicts:
	SConstruct
	configs/default
	configs/linux-dri
 2009-12-21 19:18:41 +00:00
Vinson Lee 0dd9513874 progs/tests: Silence compiler warnings. 2009-12-20 01:01:00 -08:00
Vinson Lee d87d71036c progs/trivial: Use C-style comments. 2009-12-19 00:28:01 -08:00
Vinson Lee 3340fd65fb progs/xdemos: Use C-style comment. 2009-12-19 00:00:56 -08:00
Vinson Lee 695adf41e2 progs/demos: Silence compiler warning in morph3d.c. 2009-12-18 23:46:14 -08:00
Vinson Lee 121ff55d81 progs/glsl: Use C-style comments. 2009-12-18 23:38:15 -08:00
Vinson Lee 41377942d3 progs/demos: Use C-style comment. 2009-12-18 23:34:28 -08:00
Brian Paul 263f4322e7 progs/demos: fix glut initialization calls 
Remove glutInitWindowPosition() calls to play nicer with window managers.

Move glutInitWindowSize() calls before glutInit() so the the default window
size can be overridden by the -geometry cmd line option.
 2009-12-18 13:58:14 -07:00
Michal Krol b1ed72ebe2 Move the remaining format pf_get_* functions to u_format.h. 
Previously they depended on format blocks, but after removing those
they started depending on format encoding.
 2009-12-17 23:41:57 +01:00
Vinson Lee 0a8d508854 progs/trivial: Silence compiler warnings. 2009-12-14 18:11:57 -08:00
Vinson Lee 588e9f69c4 progs/trivial: Silence compiler warnings in tri-blend-min.c. 2009-12-12 15:47:17 -08:00
Vinson Lee 786899f153 progs/trivial: Silence compiler warnings in tri-blend-max.c 2009-12-12 14:20:17 -08:00
Vinson Lee 15c6558a2e progs/xdemos: Silence compiler warnings in glxinfo.c. 2009-12-12 02:06:51 -08:00
Vinson Lee d5be33477e progs/tests: Silence compiler warnings in vpeval.c. 2009-12-12 01:34:33 -08:00
Vinson Lee 44d6ab6de5 progs/tests: Silence compiler warnings in cva.c. 2009-12-12 01:11:56 -08:00
Vinson Lee 9e2eee4ab2 progs/redbook: Silence compiler warnings in aaindex.c. 2009-12-12 01:02:16 -08:00
Brian Paul a087eb590d Merge branch 'mesa_7_7_branch' 
Conflicts:
	src/gallium/state_trackers/xorg/xorg_xv.c
	src/mesa/drivers/dri/intel/intel_span.c
 2009-12-11 10:04:07 -07:00
Brian Paul b605f4ff11 Merge branch 'mesa_7_6_branch' into mesa_7_7_branch 2009-12-11 09:22:00 -07:00
Vinson Lee 1cf60c9810 progs/samples: Byte swap individual members of struct _rawImageRec. 2009-12-10 15:41:13 -08:00
Vinson Lee bc0509bba8 progs/util: Byte swap individual members of struct _rawImageRec. 2009-12-10 13:24:15 -08:00
Andre Maasikas b5e256c76d Merge branch 'mesa_7_7_branch' 
Conflicts:
	src/mesa/drivers/dri/r600/r700_assembler.c
	src/mesa/main/version.h
 2009-12-08 11:57:24 +02:00
Andre Maasikas 0d4a05445c Merge branch 'mesa_7_6_branch' into mesa_7_7_branch 2009-12-08 10:16:14 +02:00
Vinson Lee 3e8b2fda21 progs/test: Initialize variable in prog_parameter. 
Silences uninitialized variable compiler warning.
 2009-12-07 18:40:37 -08:00
Ian Romanick 8fc433fa0f Merge branch 'mesa_7_6_branch' into mesa_7_7_branch 
Conflicts:
	progs/demos/projtex.c
	progs/xdemos/glxinfo.c
	src/mesa/main/version.h

To fix the confilicts in projtex.c and glxinfo.c I just took the code from
mesa_7_6_branch.  The conflicts seem to have occured from cherry-picks from
mesa_7_7_branch to mesa_7_6_branch followed by commmits just to
mesa_7_6_branch.
 2009-12-07 17:16:10 -08:00
Vinson Lee 7d84169865 progs/demos: Fix memory leak in projtex.c. 2009-12-07 12:31:08 -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 978b80c8e3 progs/tests: Add tests to Makefile. 
(cherry picked from commit 76d2ec3a0a)
 2009-12-05 21:20:54 -08:00
Michel Dänzer d13c603e37 Add 'texture leak' test. 2009-12-05 17:59:49 +01:00
Vinson Lee 1446f30875 progs/samples: Fix memory leak if malloc fails in rgbtoppm.c. 2009-12-05 01:43:29 -08:00
Vinson Lee 412aeeed1c progs/samples: Fix memory leak if fopen fails in rgbtoppm.c. 2009-12-05 01:38:14 -08:00
Vinson Lee 6212c8103a progs/samples: Add rgbtoppm to Makefile. 2009-12-05 01:28:47 -08:00
Vinson Lee 2cd2341ce8 progs/tests: Removed unused variable from texdown.c. 2009-12-05 01:23:05 -08:00
Vinson Lee d642edd2d1 progs/vpglsl: Assign glGetUniformLocationARB return value to GLint. 
The return type of glGetUniformLocationARB is GLint, not GLuint.
 2009-12-05 01:11:26 -08:00
Vinson Lee 8d2f3434c5 progs/fp: Redraw upon keypress. 2009-12-04 23:31:39 -08:00
Vinson Lee 4fb5ae7233 progs/util: Fix memory leak if fread returns 0 in CompileShaderFile. 
(cherry picked from commit 11905da883)
 2009-12-04 17:35:00 -08:00
Vinson Lee 5683d7d43f progs/util: Fix memory leak if fail to load/compile shader 
Signed-off-by: Brian Paul <brianp@vmware.com>
(cherry picked from commit c475079ef2)
 2009-12-04 17:32:48 -08:00
Vinson Lee e5bc2a19bd progs/fp: Add tri-inv.c to Makefile. 2009-12-04 17:29:53 -08:00
Brian Paul ca7cd3ade0 progs/xdemos: fix some visual/fbconfig logic in glxinfo.c 
The fbAttribSingle/Double arrays had wrong GLX_DOUBLEBUFFER values.
We only need to use the glXChooseFBConfig() code when glXChooseVisual()
fails (but I don't know when that would happen).
Other recent commits errantly removed some code in this area too.
 2009-12-04 08:09:57 -07:00
Vinson Lee 12a440abfb progs/xdemos: Silence unused value warnings in sharedtex_mt.c. 
(cherry picked from commit 8556fad751)
 2009-12-04 00:04:38 -08:00
Vinson Lee 4bf96ebdae progs/xdemos: Fix memory leak in pbdemo.c. 
(cherry picked from commit e0857962b9)
 2009-12-04 00:03:14 -08:00
Vinson Lee ba3fedf246 progs/xdemos: Add missing break statement in offset.c. 
(cherry picked from commit 4ab8dbe593)
 2009-12-04 00:01:20 -08:00
Vinson Lee 8350648401 progs/xdemos: Remove duplicate code in glxinfo.c. 
(cherry picked from commit a4720a1a32)
 2009-12-03 23:59:47 -08:00
Vinson Lee 7324c22024 progs/xdemos: Fix memory leak in glxinfo.c. 
(cherry picked from commit f080567f4c)
 2009-12-03 23:59:11 -08:00
Vinson Lee 68d206fafa progs/xdemos: Add assert in corender.c. 
(cherry picked from commit 66a4ec14c3)
 2009-12-03 23:22:47 -08:00
Vinson Lee 69ed1147a8 progs/vp: Fix memory leak in vp-tris.c. 
(cherry picked from commit 760cf71572)
 2009-12-03 23:20:18 -08:00
Vinson Lee efb582fde7 progs/tests: Fix memory leak in texdown.c if malloc fails. 
(cherry picked from commit e3cfd78969)
 2009-12-03 23:17:26 -08:00
Vinson Lee b210739aad progs/redbook: Fix memory leak in quadric.c. 
(cherry picked from commit 47b5f584a6)
 2009-12-03 23:12:59 -08: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 b803abbaad progs/demos: Fix memory leak in ray.c. 
(cherry picked from commit 6b480dc21d)
 2009-12-03 22:49:18 -08:00
Vinson Lee 5820dae4ec progs/demos: Fix memory leak in projtex.c. 
(cherry picked from commit ee555e3d69)
 2009-12-03 22:44:55 -08:00
Vinson Lee fc5f07de1a progs/demos: Fix memory leak in ipers.c. 
(cherry picked from commit a1afe303de)
 2009-12-03 22:38:44 -08:00
Vinson Lee d245a951f3 progs/demos: Fix memory leak in fslight.c. 
(cherry picked from commit aef3218f0b)
 2009-12-03 22:36:37 -08:00
Vinson Lee 56de7e222e progs/trivial: Redraw upon keypress. 
(cherry picked from commit 9553a42f63)
 2009-12-03 17:27:24 -08:00
Vinson Lee 34a0b22a74 progs/trivial: Redraw upon keypress. 
(cherry picked from commit 3790c6a13b)
 2009-12-03 17:25:00 -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 a0ac8fc7d8 progs/util: Exit RawImageGetData early if malloc fails. 
Prevents a null pointer deference later on.
(cherry picked from commit e26135a744)
 2009-12-03 17:14:08 -08:00
Vinson Lee 0a6acecb35 progs/util: Fix memory leak if malloc fails in RawImageOpen. 
(cherry picked from commit d36cb2396c)
 2009-12-03 17:08:48 -08:00
Vinson Lee 305d4f147e progs/util: Fix memory leak if fopen fails in RawImageOpen. 
(cherry picked from commit d9508e8df9)
 2009-12-03 17:03:26 -08:00
Vinson Lee 772e004781 progs/util: Fix memory leak if malloc fails in tkRGBImageLoad. 
(cherry picked from commit 786d539511)
 2009-12-03 16:57:17 -08:00
Vinson Lee f1172c4030 progs/util: Fix memory leak if LoadRGBImage fails. 
(cherry picked from commit 041cd0e110)
 2009-12-03 16:24:03 -08:00
Vinson Lee 84de1672d3 progs/util: Fix memory if LoadRGBMipmaps2 fails. 
(cherry picked from commit 28b8e4bcd7)
 2009-12-03 16:15:22 -08:00
Vinson Lee 4ca8e1680e progs/util: Fix memory leak if LoadYUVImage fails. 
(cherry picked from commit 0e790ac353)
 2009-12-03 16:03:22 -08:00
Vinson Lee d6a993135f progs/fp: Redraw upon keypress. 
(cherry picked from commit cde6643724)
 2009-12-03 15:59:56 -08:00
Vinson Lee 005242f166 prog/tests: Fix MSVC build. 
Signed-off-by: Brian Paul <brianp@vmware.com>
(cherry picked from commit 9c3197ef0a)
 2009-12-03 15:53:13 -08:00
Vinson Lee d3208678c2 progs/tests: fix MSVC build. 
Signed-off-by: Brian Paul <brianp@vmware.com>
(cherry picked from commit a8ed066858)
 2009-12-03 15:50:36 -08:00
Vinson Lee 97cbf4943a progs/tests: Fix MSVC build. 
(cherry picked from commit 50e113e375)
 2009-12-03 15:45:18 -08:00
Vinson Lee a99bf51bc8 progs/tests: Fix MSVC build. 
(cherry picked from commit 952bf63e2c)
 2009-12-03 15:35:10 -08:00
José Fonseca 28474e1225 progs/tests: Use rand() instead of random(). 
Forgot these on previous commit.
(cherry picked from commit 166957abeb)
 2009-12-03 15:34:38 -08:00
José Fonseca bb6e3af939 progs/tests: Use rand() instead of random(). 
More portable. Same implementation on Linux.
(cherry picked from commit 699260b195)
 2009-12-03 15:32:45 -08:00
Vinson Lee a38776419b progs/tests: Fix MSVC build. 
(cherry picked from commit f7455ad7af)
 2009-12-03 15:29:01 -08:00
Vinson Lee 791b754687 prog/tests: Fix MSVC build. 
(cherry picked from commit 60b6c74583)
 2009-12-03 15:24:43 -08:00
Vinson Lee 89e747920f prog/tests: Fix MSVC build. 
(cherry picked from commit 96fd13c1a0)
 2009-12-03 15:15:12 -08:00
Vinson Lee 5a25adb646 progs/tests: fix MSVC build. 
(cherry picked from commit 9c778a90ea)
 2009-12-03 15:11:25 -08:00
Vinson Lee 3910e88ebf prog/tests: Fix MSVC build. 
(cherry picked from commit ea862ec8ff)
 2009-12-03 15:05:44 -08:00
Vinson Lee 235c0c8134 progs/vpglsl: Fix psiz-mul.glsl compilation error on Mac OS. 
(cherry picked from commit b98db7bf69)
 2009-12-02 20:28:54 -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 67a0628ab2 progs: Ignore Mac OS dSYM directories. 
(cherry picked from commit a420056750)
 2009-12-02 15:22:34 -08:00
Jakob Bornecrantz 0c75854cc1 Merge commit 'mesa_7_6_branch' into mesa_7_7_branch 
Conflicts:
	src/mesa/main/version.h
 2009-12-02 14:52:51 +01:00
Brian Paul ba97b98842 progs/demos: remove unused glFogCoordPointer_ext var 2009-12-01 12:23:07 -07:00
Tom Fogal b9f4a0bd2b Simplify hackery added to fix AIX build. 
Borrow an idiom from the GNU build system which can handle `for'
loops over empty lists.
 2009-12-01 10:27:27 -08:00
Ian Romanick 650e02003f Merge branch 'mesa_7_6_branch' into mesa_7_7_branch 
Conflicts:
	progs/util/shaderutil.c
	src/mesa/drivers/dri/r600/r600_context.c
	src/mesa/main/version.h
 2009-11-30 17:47:07 -08:00
Keith Whitwell cddc7e3a9c brw: add dumping to gem winsys 2009-11-30 15:37:27 +00:00
Ian Romanick da0883114b shaderutil: Fix detection of shaders 
Check for versions >= 2.0 (because some drivers return 3.0), and return
GL_FALSE if shaders are not detected.
 2009-11-23 18:33:50 -08:00
Vinson Lee e19195c185 progs/xdemos: Fix memory leak in pbinfo.c. 2009-11-20 15:52:53 -08:00
Vinson Lee e0857962b9 progs/xdemos: Fix memory leak in pbdemo.c. 2009-11-20 15:48:29 -08:00
Vinson Lee 538a8df652 progs/xdemos: Fix memory leak in glxpbdemo.c. 2009-11-20 15:18:19 -08:00
Vinson Lee a4720a1a32 progs/xdemos: Remove duplicate code in glxinfo.c. 2009-11-20 15:06:56 -08:00
Vinson Lee 66a4ec14c3 progs/xdemos: Add assert in corender.c. 2009-11-20 15:03:16 -08:00
Keith Whitwell 3fafe2b969 progs/vp: add param and imm test 2009-11-19 19:50:19 -08:00
Keith Whitwell 7e5cd3eb14 progs/fp: add simple imm, param tests 2009-11-19 16:53:02 -08:00
Tom Fogal 8f24e863c3 progs: Fix quoting issue with empty set of PROGRAM_DIRS. 
Quotes are important to make sure the argument to test -n really
is the empty string, but that requires stringifying PROGRAM_DIRS.

Signed-off-by: Brian Paul <brianp@vmware.com>
 2009-11-19 09:26:39 -07:00