Jakob Bornecrantz [Fri, 4 Dec 2009 15:22:48 +0000 (16:22 +0100)]
st/xorg: Add enter/leave vt hooks for winsys
Jakob Bornecrantz [Fri, 4 Dec 2009 15:05:03 +0000 (16:05 +0100)]
st/xorg: Fix leave enter vt cycle in crtc code
Jakob Bornecrantz [Fri, 4 Dec 2009 15:13:57 +0000 (16:13 +0100)]
st/xorg: New libkms destroy api
Michel Dänzer [Tue, 8 Dec 2009 10:45:19 +0000 (11:45 +0100)]
vmware/xorg: Fix SCons build.
Not sure how vmw_screen.c could build at all though...
Michel Dänzer [Tue, 8 Dec 2009 10:43:22 +0000 (11:43 +0100)]
vmware/xorg: Avoid warning about HAVE_STDINT_H being redefined.
Andre Maasikas [Tue, 8 Dec 2009 08:16:14 +0000 (10:16 +0200)]
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
Andre Maasikas [Thu, 3 Dec 2009 10:26:44 +0000 (12:26 +0200)]
r600: add support for TXB instruction
makes testing other things easier - does not hang the card
TODO: enable TEX dependency tracking in vertex programs
Andre Maasikas [Wed, 4 Nov 2009 08:00:47 +0000 (10:00 +0200)]
r600: reorder state for render_target and blend
First time around render targets are not enabled yet (done in
r700SendRenderTargetState) so blend state is not emitted for any targets.
Affects first glClear in some mesa tests.
As a quick fix reorder state emit so that target is set first
Vinson Lee [Tue, 8 Dec 2009 03:04:07 +0000 (19:04 -0800)]
llvmpipe: Initialize variables in emit_instruction.
Vinson Lee [Tue, 8 Dec 2009 02:40:37 +0000 (18:40 -0800)]
progs/test: Initialize variable in prog_parameter.
Silences uninitialized variable compiler warning.
Ian Romanick [Tue, 8 Dec 2009 01:18:56 +0000 (17:18 -0800)]
mesa: set version string to 7.7-rc1
Also modify the Makefile to use the correct version for the tarballs.
Ian Romanick [Tue, 8 Dec 2009 01:16:10 +0000 (17:16 -0800)]
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.
Ian Romanick [Tue, 8 Dec 2009 01:06:07 +0000 (17:06 -0800)]
Revert "intel: Make RGB renderbuffers use XRGB8888 like we do for RGB system buffers."
This reverts commit
4598942b1b88a2a7d5af7febae7e79eedf00e385.
XRGB8888 doesn't work as intended. Revert this for now, and we'll revisit it
for 7.8 or something.
Ian Romanick [Tue, 8 Dec 2009 00:59:59 +0000 (16:59 -0800)]
mesa: set version string to 7.6.1-rc3
Maciej Cencora [Mon, 7 Dec 2009 21:24:41 +0000 (22:24 +0100)]
radeon: fix cases when only first image where put directly into miptree.
Make sure that minimal width, height and depth of texture image is 1.
Maciej Cencora [Mon, 7 Dec 2009 21:22:57 +0000 (22:22 +0100)]
radeon: fix image migration for small compressed textures
memcpy would give incorrect results if src rowstride != dst rowstride
Vinson Lee [Mon, 7 Dec 2009 20:31:08 +0000 (12:31 -0800)]
progs/demos: Fix memory leak in projtex.c.
Vinson Lee [Sat, 21 Nov 2009 00:33:25 +0000 (16:33 -0800)]
st/egl: Fix memory leak in egl_tracker.c.
(cherry picked from commit
052b127842af3372fd768eae8e29b240a696a12a)
Vinson Lee [Sun, 29 Nov 2009 04:22:31 +0000 (23:22 -0500)]
dri: Fix potential null pointer dereference in driBindContext.
(cherry picked from commit
919898e92fa23ff71a59d86a46ff0886a6f34e4d)
Vinson Lee [Tue, 24 Nov 2009 05:57:55 +0000 (00:57 -0500)]
dri: Fix potential null pointer deference in dri_put_drawable.
(cherry picked from commit
364070b1f2b08d43fb205ec198894a35bec6b2f3)
Vinson Lee [Mon, 23 Nov 2009 06:30:32 +0000 (01:30 -0500)]
glx: Prevent potential null pointer deference in driCreateContext.
(cherry picked from commit
4b0b250aae6ae7d48cd24f9d91d05ab58086c4b2)
Vinson Lee [Fri, 9 Oct 2009 13:24:04 +0000 (07:24 -0600)]
progs/tests: Add tests to Makefile.
(cherry picked from commit
76d2ec3a0a047a65ffca70f53848241a3225dad3)
Vinson Lee [Sat, 21 Nov 2009 00:03:48 +0000 (16:03 -0800)]
draw: Initialize variable in draw_pt.c.
(cherry picked from commit
ea98e9820d7117f7a187f355445796b1ef5d9e0c)
Vinson Lee [Sun, 29 Nov 2009 05:50:48 +0000 (00:50 -0500)]
mesa: Fix array out-of-bounds access by _mesa_TexGenf.
_mesa_TexGenf calls _mesa_TexGenfv, which uses the params argument
as an array.
(cherry picked from commit
ca5a7aadb4361e7d053aea8687372cd44cbd8795)
Vinson Lee [Sun, 29 Nov 2009 04:47:23 +0000 (23:47 -0500)]
mesa: Fix array out-of-bounds access by _mesa_TexGeni.
_mesa_TexGeni calls _mesa_TexGeniv, which uses the params argument
as an array.
(cherry picked from commit
d55fb7c835b56951f05a058083e7eda264ba192e)
Vinson Lee [Mon, 30 Nov 2009 02:17:44 +0000 (21:17 -0500)]
mesa: Fix array out-of-bounds access by _mesa_TexParameterf.
_mesa_TexParameterf calls set_tex_parameterf, which uses the params
argument as an array.
(cherry picked from commit
270d36da146b899d39e08f830fe34b63833a3731)
Vinson Lee [Sun, 29 Nov 2009 23:18:23 +0000 (18:18 -0500)]
mesa: Fix array out-of-bounds access by _mesa_TexParameterf.
_mesa_TexParameterf calls set_tex_parameteri, which uses the params
argument as an array.
(cherry picked from commit
a201dfb6bf28b89d6f511c2ec9ae0d81ef18511d)
Vinson Lee [Sat, 5 Dec 2009 09:43:29 +0000 (01:43 -0800)]
progs/samples: Fix memory leak if malloc fails in rgbtoppm.c.
Vinson Lee [Sat, 5 Dec 2009 09:38:14 +0000 (01:38 -0800)]
progs/samples: Fix memory leak if fopen fails in rgbtoppm.c.
Vinson Lee [Sat, 5 Dec 2009 09:28:47 +0000 (01:28 -0800)]
progs/samples: Add rgbtoppm to Makefile.
Vinson Lee [Sat, 5 Dec 2009 09:22:34 +0000 (01:22 -0800)]
progs/tests: Removed unused variable from texdown.c.
Vinson Lee [Sat, 5 Dec 2009 09:11:26 +0000 (01:11 -0800)]
progs/vpglsl: Assign glGetUniformLocationARB return value to GLint.
The return type of glGetUniformLocationARB is GLint, not GLuint.
Vinson Lee [Sat, 5 Dec 2009 07:31:39 +0000 (23:31 -0800)]
progs/fp: Redraw upon keypress.
Vinson Lee [Sun, 29 Nov 2009 03:04:06 +0000 (22:04 -0500)]
mesa: Fix array out-of-bounds access in _mesa_TexEnvf.
_mesa_TexEnvf calls _mesa_TexEnvfv, which uses the param argument
as an array.
(cherry picked from commit
a11d60d14caf8efc07f70af63b57b33273f8cf9b)
Vinson Lee [Tue, 17 Nov 2009 20:00:22 +0000 (12:00 -0800)]
progs/util: Fix memory leak if fread returns 0 in CompileShaderFile.
(cherry picked from commit
11905da8836822f7dd60c84b5eefc72e46c94b50)
Vinson Lee [Tue, 3 Nov 2009 21:41:08 +0000 (14:41 -0700)]
progs/util: Fix memory leak if fail to load/compile shader
Signed-off-by: Brian Paul <brianp@vmware.com>
(cherry picked from commit
c475079ef2d901ba4506ebd53e19419cd46793ab)
Vinson Lee [Sat, 5 Dec 2009 01:29:53 +0000 (17:29 -0800)]
progs/fp: Add tri-inv.c to Makefile.
Coleman Kane [Fri, 4 Dec 2009 15:44:57 +0000 (08:44 -0700)]
r300g: use $(MAKE) variable
Fixes bug 24501
Brian Paul [Fri, 4 Dec 2009 15:09:55 +0000 (08:09 -0700)]
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.
Brian Paul [Fri, 4 Dec 2009 15:09:07 +0000 (08:09 -0700)]
docs: a few more fixes for 7.6.1
Alex Deucher [Fri, 4 Dec 2009 14:52:37 +0000 (09:52 -0500)]
radeon: fix polygon stipple
fixes fdo bug 25354
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Jakob Bornecrantz [Fri, 4 Dec 2009 09:31:51 +0000 (10:31 +0100)]
vmware/xorg: Use Write instead of WriteRead for cursor bypass
Jakob Bornecrantz [Fri, 4 Dec 2009 08:53:00 +0000 (09:53 +0100)]
vmware/xorg: Give kernel infromation about cursor bypass
Jakob Bornecrantz [Fri, 4 Dec 2009 08:40:52 +0000 (09:40 +0100)]
vmware/xorg: Handle no init of video in vmw_video_close
Jakob Bornecrantz [Fri, 4 Dec 2009 08:42:10 +0000 (09:42 +0100)]
vmware/core: Update vmwgfx_drm.h to include cursor bypass
Jakob Bornecrantz [Fri, 4 Dec 2009 18:50:29 +0000 (18:50 +0000)]
gallium: DRI drivers enabled by default, Xorg drivers auto by default.
This change enabled gallium dri drivers by default under the
configure build system. Xorg drivers are built automaticaly
if a Xorg dev enviroment is installed and the Xorg version
is higher then 1.6.0.
Jakob Bornecrantz [Fri, 4 Dec 2009 16:01:41 +0000 (16:01 +0000)]
i915g: Do not build winsys and binaries by default
Using a hack in the configure script the gallium intel
drivers have 3 options. Off, nothing is built. On, the
driver and binaries are built. Auto, only the driver but
not the binaries and winsys is built.
Since the i915g driver builds everywhere its can enable
the driver per default, so we can get build coverage.
But building the binaries per default is a pain for
distributions and testers since they conflict on the
install target with the old mesa drivers. Which are more
stable/faster/better.
So this change gives us the best of both worlds.
Vinson Lee [Thu, 26 Nov 2009 05:35:31 +0000 (00:35 -0500)]
glu/sgi: Fix memory leak in gluBuild2DMipmapLevelsCore.
(cherry picked from commit
808f0376607b0e2d31dfebc888fd8f1e737fed09)
Vinson Lee [Wed, 25 Nov 2009 05:39:37 +0000 (00:39 -0500)]
glu/sgi: Fix memory leak in gluBuild1DMipmapLevelsCore.
(cherry picked from commit
94bcb9f1a43f2ab3bdff09156e3ab5b1c115cbd8)
Vinson Lee [Wed, 25 Nov 2009 05:28:56 +0000 (00:28 -0500)]
glu/sgi: Fix memory leak in gluBuild2DMipmapLevelsCore.
(cherry picked from commit
0d89f3dc7ff3f89ba8d5d664253730485bca35e2)
Vinson Lee [Wed, 25 Nov 2009 05:18:49 +0000 (00:18 -0500)]
glu/sgi: Fix memory leak in gluBuild3DMipmapLevelsCore.
(cherry picked from commit
f895abbd9777c4985aa40cf660c68f6d7333f0ec)
Vinson Lee [Tue, 24 Nov 2009 06:23:12 +0000 (01:23 -0500)]
glu/sgi: Fix memory leak in gluBuild3DMipmapLevelsCore.
(cherry picked from commit
326b66d724754ca97012501db1c7c62d7d41a457)
Vinson Lee [Mon, 23 Nov 2009 06:09:06 +0000 (01:09 -0500)]
glu/sgi: Fix memory leak in bitmapBuild2DMipmaps.
(cherry picked from commit
5b925b7daa566d799c4f50911a7fcca114131503)
Vinson Lee [Mon, 23 Nov 2009 05:57:37 +0000 (00:57 -0500)]
glu/sgi: Fix memory leak in gluScaleImage3D.
(cherry picked from commit
b611f639b4bffdcca376293f7ce71af9f6bdbff3)
Vinson Lee [Sun, 22 Nov 2009 06:57:35 +0000 (01:57 -0500)]
glu/sgi: Fix memory leak in gluScaleImage.
(cherry picked from commit
a9c540f5dedbf593f8038fdbc95eecb60826ab26)
Vinson Lee [Sun, 22 Nov 2009 06:45:53 +0000 (01:45 -0500)]
glu: Fix memory leak in __gl_meshMakeEdge.
(cherry picked from commit
d3b4c99c703f70a9d0e715a97e52672f7f8fc980)
Vinson Lee [Fri, 20 Nov 2009 21:09:42 +0000 (13:09 -0800)]
progs/xdemos: Silence unused value warnings in sharedtex_mt.c.
(cherry picked from commit
8556fad75124e1ade9af095e112ebb6ac5cbff61)
Vinson Lee [Fri, 20 Nov 2009 23:48:29 +0000 (15:48 -0800)]
progs/xdemos: Fix memory leak in pbdemo.c.
(cherry picked from commit
e0857962b911ef317238498305651515d83029ae)
Vinson Lee [Thu, 19 Nov 2009 22:20:26 +0000 (14:20 -0800)]
progs/xdemos: Add missing break statement in offset.c.
(cherry picked from commit
4ab8dbe5935d5c946cbc9af6982461073a784d07)
Vinson Lee [Fri, 20 Nov 2009 23:06:56 +0000 (15:06 -0800)]
progs/xdemos: Remove duplicate code in glxinfo.c.
(cherry picked from commit
a4720a1a3206dd2edecf47a21fce547a79b67610)
Vinson Lee [Fri, 20 Nov 2009 21:01:22 +0000 (13:01 -0800)]
progs/xdemos: Fix memory leak in glxinfo.c.
(cherry picked from commit
f080567f4c4018c4885c105a154cb0eb39e6234f)
Vinson Lee [Fri, 20 Nov 2009 23:03:16 +0000 (15:03 -0800)]
progs/xdemos: Add assert in corender.c.
(cherry picked from commit
66a4ec14c38d407256545e0cf31c98974d621fe4)
Vinson Lee [Fri, 20 Nov 2009 06:59:01 +0000 (22:59 -0800)]
progs/vp: Fix memory leak in vp-tris.c.
(cherry picked from commit
760cf71572a071ce43da576ebfeff4a8099150bc)
Vinson Lee [Thu, 19 Nov 2009 01:30:50 +0000 (17:30 -0800)]
progs/tests: Fix memory leak in texdown.c if malloc fails.
(cherry picked from commit
e3cfd78969cd4a94fc83a5d6fb2f33730cc4e70f)
Vinson Lee [Tue, 17 Nov 2009 22:10:35 +0000 (14:10 -0800)]
progs/redbook: Fix memory leak in quadric.c.
(cherry picked from commit
47b5f584a68ceab7c9c1d5279efbc9fe30ff2fcc)
Vinson Lee [Tue, 17 Nov 2009 17:53:19 +0000 (09:53 -0800)]
progs/glsl: Fix memory leak in deriv.c.
(cherry picked from commit
0e783c7d03128aade3ca50b28a56e254fef6b6ab)
Vinson Lee [Tue, 17 Nov 2009 19:37:48 +0000 (11:37 -0800)]
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
b8dcb79c53796f37234bd2b0f5e2845f817fc218)
Vinson Lee [Tue, 17 Nov 2009 02:06:40 +0000 (18:06 -0800)]
progs/demos: Fix memory leak in ray.c.
(cherry picked from commit
6b480dc21dd489d48685b2268e495218aea74293)
Vinson Lee [Tue, 17 Nov 2009 00:31:34 +0000 (16:31 -0800)]
progs/demos: Fix memory leak in projtex.c.
(cherry picked from commit
ee555e3d69c8820f27e71e5ebc028a768cef7d0b)
Vinson Lee [Mon, 16 Nov 2009 23:44:52 +0000 (15:44 -0800)]
progs/demos: Fix memory leak in ipers.c.
(cherry picked from commit
a1afe303deda320aadacdaf5b1c72631ca3f734f)
Vinson Lee [Mon, 16 Nov 2009 22:56:07 +0000 (14:56 -0800)]
progs/demos: Fix memory leak in fslight.c.
(cherry picked from commit
aef3218f0bb48fdb286d2008ee07e507ea8aa98e)
Vinson Lee [Fri, 20 Nov 2009 22:20:15 +0000 (14:20 -0800)]
gallium/util: Initialize variables in u_pack_color.h.
(cherry picked from commit
36e2074b63e3e5bc489eb74cad0cd97eafcedb40)
Vinson Lee [Fri, 20 Nov 2009 06:52:05 +0000 (22:52 -0800)]
progs/trivial: Redraw upon keypress.
(cherry picked from commit
9553a42f638bd98eb90e5b7fb37d6b82758b6363)
Vinson Lee [Thu, 19 Nov 2009 21:03:12 +0000 (13:03 -0800)]
progs/trivial: Redraw upon keypress.
(cherry picked from commit
3790c6a13b86dfe0afd4bb0bf9a4d9f4b429cfd8)
Vinson Lee [Fri, 20 Nov 2009 06:46:19 +0000 (22:46 -0800)]
progs/glsl: Redraw upon keypress.
(cherry picked from commit
881f55236ad85f95745e70f8363726fa3c201f80)
Vinson Lee [Fri, 20 Nov 2009 20:11:55 +0000 (12:11 -0800)]
progs/util: Exit RawImageGetData early if malloc fails.
Prevents a null pointer deference later on.
(cherry picked from commit
e26135a744f740430e3dc341fa692544ba99c11e)
Vinson Lee [Fri, 20 Nov 2009 19:22:13 +0000 (11:22 -0800)]
progs/util: Fix memory leak if malloc fails in RawImageOpen.
(cherry picked from commit
d36cb2396c942f05ba56c5b899792a507bb0f0fd)
Vinson Lee [Tue, 17 Nov 2009 21:49:31 +0000 (13:49 -0800)]
progs/util: Fix memory leak if fopen fails in RawImageOpen.
(cherry picked from commit
d9508e8df9da4aa13bc223194c406081738bac91)
Vinson Lee [Tue, 17 Nov 2009 19:04:24 +0000 (11:04 -0800)]
progs/util: Fix memory leak if malloc fails in tkRGBImageLoad.
(cherry picked from commit
786d539511eb3c5a4101b11b7f8e90d60123ac46)
Vinson Lee [Tue, 17 Nov 2009 18:11:50 +0000 (10:11 -0800)]
progs/util: Fix memory leak if LoadRGBImage fails.
(cherry picked from commit
041cd0e110d41b543a0fe9cc484ae8373642912b)
Vinson Lee [Tue, 17 Nov 2009 16:29:36 +0000 (08:29 -0800)]
progs/util: Fix memory if LoadRGBMipmaps2 fails.
(cherry picked from commit
28b8e4bcd76cc072b062e4c8575327c05ecb9a55)
Vinson Lee [Tue, 17 Nov 2009 02:22:26 +0000 (18:22 -0800)]
progs/util: Fix memory leak if LoadYUVImage fails.
(cherry picked from commit
0e790ac35327a0b53a4a595a6429135317302269)
Vinson Lee [Wed, 18 Nov 2009 22:41:40 +0000 (14:41 -0800)]
progs/fp: Redraw upon keypress.
(cherry picked from commit
cde66437247feb8b14b6d8f3ec3a8b4665fefa08)
Vinson Lee [Fri, 30 Oct 2009 21:02:21 +0000 (15:02 -0600)]
prog/tests: Fix MSVC build.
Signed-off-by: Brian Paul <brianp@vmware.com>
(cherry picked from commit
9c3197ef0abc3bf521358ea0c7af0fc6979c82b3)
Vinson Lee [Fri, 30 Oct 2009 15:39:51 +0000 (09:39 -0600)]
progs/tests: fix MSVC build.
Signed-off-by: Brian Paul <brianp@vmware.com>
(cherry picked from commit
a8ed066858f12290239ddc9165b7c0734ccc0247)
Vinson Lee [Mon, 26 Oct 2009 21:03:31 +0000 (15:03 -0600)]
progs/tests: Fix MSVC build.
(cherry picked from commit
50e113e375b4ecfdf5b60ccce7bbcdb1c5f2ca11)
Vinson Lee [Fri, 23 Oct 2009 19:49:02 +0000 (13:49 -0600)]
progs/tests: Fix MSVC build.
(cherry picked from commit
952bf63e2cf442504ef89b0b1d276da0d52b21d4)
José Fonseca [Fri, 16 Oct 2009 10:39:29 +0000 (11:39 +0100)]
progs/tests: Use rand() instead of random().
Forgot these on previous commit.
(cherry picked from commit
166957abebea6aa203eba7e6348e89d53cf0e13e)
José Fonseca [Fri, 16 Oct 2009 10:39:29 +0000 (11:39 +0100)]
progs/tests: Use rand() instead of random().
More portable. Same implementation on Linux.
(cherry picked from commit
699260b19535abaa3af0a5d33eb039e3d6a30ce9)
Vinson Lee [Thu, 8 Oct 2009 14:08:11 +0000 (08:08 -0600)]
progs/tests: Fix MSVC build.
(cherry picked from commit
f7455ad7af09b5ef31ccc454b79422a13c59af9a)
Vinson Lee [Fri, 16 Oct 2009 10:36:09 +0000 (11:36 +0100)]
prog/tests: Fix MSVC build.
(cherry picked from commit
60b6c7458319ff01ecdd9d1650d526ac8f75e194)
Vinson Lee [Tue, 13 Oct 2009 00:05:05 +0000 (18:05 -0600)]
prog/tests: Fix MSVC build.
(cherry picked from commit
96fd13c1a024e3b6c0b1c44394c67c772e52b9c9)
Vinson Lee [Tue, 6 Oct 2009 22:02:47 +0000 (16:02 -0600)]
progs/tests: fix MSVC build.
(cherry picked from commit
9c778a90ea24f25437b68bb67856c81add61e261)
Vinson Lee [Wed, 14 Oct 2009 13:43:18 +0000 (07:43 -0600)]
prog/tests: Fix MSVC build.
(cherry picked from commit
ea862ec8ff4a52b30b822e737d93a49330be9e31)
Maciej Cencora [Thu, 3 Dec 2009 19:21:16 +0000 (20:21 +0100)]
radeon: workaround an FBO issue
Fixes #21501
Maciej Cencora [Wed, 2 Dec 2009 22:03:51 +0000 (23:03 +0100)]
radeon: properly check if image should be placed in the miptree
Fixes #25355
Alex Deucher [Thu, 3 Dec 2009 16:20:40 +0000 (11:20 -0500)]
r200: fix polygon stipple
fixes fdo bug 25354
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Vinson Lee [Tue, 8 Sep 2009 11:31:42 +0000 (12:31 +0100)]
scons: Add Mac OS to target platform list.
(cherry picked from commit
2c307c775018e5b9680de8022ddf0ce3b6f560be)
Vinson Lee [Fri, 20 Nov 2009 07:56:07 +0000 (23:56 -0800)]
progs/vpglsl: Fix psiz-mul.glsl compilation error on Mac OS.
(cherry picked from commit
b98db7bf697c3ed6e6df303e9dd66f7ac31eb3e2)
Vinson Lee [Wed, 18 Nov 2009 22:02:20 +0000 (14:02 -0800)]
progs/glsl: Fix trirast GLSL compilation errors on Mac OS.
(cherry picked from commit
4b3ec2acf2cc2830b0907e4fb4db8bd1ff4a18e3)