mesa.git
14 years agoNV30/NV40 CMP and SCS src == dst handling
Luca Barbieri [Sat, 26 Dec 2009 07:12:15 +0000 (08:12 +0100)]
NV30/NV40 CMP and SCS src == dst handling

CMP and SCS can produce incorrect results if the source and
destination are the same.
This patch should fix the issues.
CMP is fixed by predicating both moves.
SCS by changing the order if the source component is X.

14 years agollvmpipe: Unmapping vertex/index buffers does NOT flush draw module anymore.
José Fonseca [Mon, 28 Dec 2009 22:52:41 +0000 (22:52 +0000)]
llvmpipe: Unmapping vertex/index buffers does NOT flush draw module anymore.

Not since 6094e79f4e3350d123c7532b1c73faa60834a62d.

Drivers now need to flush draw module explicitely (which explains why
all those previous commits adding draw_flushes calls were necessary).

This is a good thing, but it's tricky to get this right in face of user buffers
(it's not even clear who has the responsibility to flush when a user buffer
is seen -- statetracker or pipe driver), so just force flush (temporarily)
since it's not a bottleneck now.

14 years agopython/retrace: Dump only the specified image rectangles.
José Fonseca [Mon, 28 Dec 2009 16:39:30 +0000 (16:39 +0000)]
python/retrace: Dump only the specified image rectangles.

14 years agoxlib: Integrate the trace driver with all pipe drivers.
José Fonseca [Mon, 28 Dec 2009 16:25:48 +0000 (16:25 +0000)]
xlib: Integrate the trace driver with all pipe drivers.

And not just softpipe.

It is particularly convenient to use llvmpipe instead, since it is much
faster. It also allows to use rbug with all xlib drivers.

14 years agoscons: Fix xlib build.
José Fonseca [Mon, 28 Dec 2009 15:22:17 +0000 (15:22 +0000)]
scons: Fix xlib build.

After glsl rework merge.

14 years agonv04: Fix build after the latest nouveau_class.h changes.
Francisco Jerez [Sat, 26 Dec 2009 16:26:49 +0000 (17:26 +0100)]
nv04: Fix build after the latest nouveau_class.h changes.

14 years agonv50: Dehexify and bring up to date with new method defines.
Marcin Kościelnicki [Mon, 28 Dec 2009 16:23:40 +0000 (16:23 +0000)]
nv50: Dehexify and bring up to date with new method defines.

Signed-off-by: Francisco Jerez <currojerez@riseup.net>
14 years agoMerge branch 'mesa_7_7_branch'
Brian Paul [Sun, 27 Dec 2009 17:24:21 +0000 (10:24 -0700)]
Merge branch 'mesa_7_7_branch'

14 years agocell: add glsl to SRC_DIRS
Brian Paul [Sun, 27 Dec 2009 17:24:12 +0000 (10:24 -0700)]
cell: add glsl to SRC_DIRS

14 years agost/mesa: add missing case for PIPE_FORMAT_B8G8R8A8_UNORM
Brian Paul [Sun, 27 Dec 2009 17:09:24 +0000 (10:09 -0700)]
st/mesa: add missing case for PIPE_FORMAT_B8G8R8A8_UNORM

14 years agor300g: fix use of uninitialised variables.
Dave Airlie [Sun, 27 Dec 2009 06:13:41 +0000 (16:13 +1000)]
r300g: fix use of uninitialised variables.

These buffers were getting dereferenced later.

14 years agor300g: rename modesetting_drv.so to radeong_drv.so
Dave Airlie [Sun, 27 Dec 2009 05:23:13 +0000 (15:23 +1000)]
r300g: rename modesetting_drv.so to radeong_drv.so

14 years agosoftpipe: Flush draw module when fragment pipeline state changes.
José Fonseca [Sat, 26 Dec 2009 21:05:31 +0000 (21:05 +0000)]
softpipe: Flush draw module when fragment pipeline state changes.

14 years agollvmpipe: Treat state changes systematically.
José Fonseca [Sat, 26 Dec 2009 15:21:16 +0000 (15:21 +0000)]
llvmpipe: Treat state changes systematically.

That is:
- check for no op
- update/flush draw module
- update bound state and mark it as dirty

In particular flushing the draw module is important since it may contain
unflushed primitives which would otherwise be draw with wrong state.

14 years agoi965: Extra asserts on flow control instructions to clarify for clang.
Eric Anholt [Wed, 23 Dec 2009 01:30:13 +0000 (17:30 -0800)]
i965: Extra asserts on flow control instructions to clarify for clang.

14 years agoi965: Clean up double initialization of dst_flags from a rebase resolve.
Eric Anholt [Wed, 23 Dec 2009 01:18:03 +0000 (17:18 -0800)]
i965: Clean up double initialization of dst_flags from a rebase resolve.

Caught by clang.

14 years agoi965: Fix setup of immediate types for gen4 disasm.
Eric Anholt [Wed, 23 Dec 2009 01:05:10 +0000 (17:05 -0800)]
i965: Fix setup of immediate types for gen4 disasm.

Caught by clang.

14 years agollvmpipe: Use comments and more code from softpipe's is_texture_referenced implementa...
José Fonseca [Sat, 26 Dec 2009 11:02:02 +0000 (11:02 +0000)]
llvmpipe: Use comments and more code from softpipe's is_texture_referenced implementation.

14 years agosoftpipe: Flush draw module before switching framebuffer.
José Fonseca [Sat, 26 Dec 2009 11:01:05 +0000 (11:01 +0000)]
softpipe: Flush draw module before switching framebuffer.

Otherwise geometry might end up in the wrong rendertarget.

14 years agollvmpipe: Flush draw module before switching framebuffer.
José Fonseca [Sat, 26 Dec 2009 11:00:42 +0000 (11:00 +0000)]
llvmpipe: Flush draw module before switching framebuffer.

Otherwise geometry will end up in the wrong rendertarget.

14 years agotgsi: Don't dump parenthesis for negation.
José Fonseca [Sat, 26 Dec 2009 10:59:46 +0000 (10:59 +0000)]
tgsi: Don't dump parenthesis for negation.

It doesn't seem necessary, and more importantly, tgsi_parse doesn't know
how to read them.

14 years agopython: Update python state tracker and samples for recent interface changes.
José Fonseca [Sat, 26 Dec 2009 01:14:59 +0000 (01:14 +0000)]
python: Update python state tracker and samples for recent interface changes.

14 years agotrace: Fix transfer size computation.
José Fonseca [Fri, 25 Dec 2009 17:40:08 +0000 (17:40 +0000)]
trace: Fix transfer size computation.

14 years agoscons: Put the configuration info in the build directory too.
José Fonseca [Fri, 25 Dec 2009 17:39:47 +0000 (17:39 +0000)]
scons: Put the configuration info in the build directory too.

It fixes cached configuration results from one platform being erroneously
used in other platforms.

14 years agosvga: Allow to dump an individual command.
José Fonseca [Thu, 24 Dec 2009 15:53:45 +0000 (15:53 +0000)]
svga: Allow to dump an individual command.

14 years agor300g: fixup for GS additions
Dave Airlie [Fri, 25 Dec 2009 21:28:21 +0000 (07:28 +1000)]
r300g: fixup for GS additions

draw_set_mapped_constant_buffer changed API

14 years agogallium: remove TGSI_SEMANTIC_VERTICES
Zack Rusin [Thu, 24 Dec 2009 18:08:36 +0000 (13:08 -0500)]
gallium: remove TGSI_SEMANTIC_VERTICES

it's a leftover from an early version of geometry shading support.
geometry shaders now encode the primitive size in the PROPERTY token
and don't need special input with their size.

14 years agodraw: disable some debugging output coming from the geometry shaders
Zack Rusin [Thu, 24 Dec 2009 14:34:07 +0000 (09:34 -0500)]
draw: disable some debugging output coming from the geometry shaders

14 years agogallium: geometry shader can be always enabled and we don't need a cap for that
Zack Rusin [Thu, 24 Dec 2009 14:30:00 +0000 (09:30 -0500)]
gallium: geometry shader can be always enabled and we don't need a cap for that

using the draw module allows us to enable geometry shading even on hardware
that doesn't support it.

14 years agoutil: put vertices_per_primitive function in its proper location
Zack Rusin [Thu, 24 Dec 2009 14:20:45 +0000 (09:20 -0500)]
util: put vertices_per_primitive function in its proper location

14 years agodraw/tgsi: fix geometry shader input/output swizzling
Zack Rusin [Thu, 24 Dec 2009 13:15:29 +0000 (08:15 -0500)]
draw/tgsi: fix geometry shader input/output swizzling

14 years agotgsi: dump the indices correctly when dealing with 2d arrays
Zack Rusin [Wed, 23 Dec 2009 20:41:47 +0000 (15:41 -0500)]
tgsi: dump the indices correctly when dealing with 2d arrays

14 years agotgsi: fix property parsing/building
Zack Rusin [Wed, 23 Dec 2009 19:39:16 +0000 (14:39 -0500)]
tgsi: fix property parsing/building

14 years agopython: fix python state tracker after some latest changes
Zack Rusin [Wed, 23 Dec 2009 18:43:30 +0000 (13:43 -0500)]
python: fix python state tracker after some latest changes

14 years agosoftpipe: make it possible to dump geometry shader from the softpipe
Zack Rusin [Wed, 23 Dec 2009 18:30:12 +0000 (13:30 -0500)]
softpipe: make it possible to dump geometry shader from the softpipe

14 years agotgsi: add missing support for two dimensional arrays in various places
Zack Rusin [Wed, 23 Dec 2009 17:40:39 +0000 (12:40 -0500)]
tgsi: add missing support for two dimensional arrays in various places

in particular asm text parsing and sanity checking were missing code
to handle multi-dimensional arrays/geometry shaders

14 years agopython/gs: fix the example
Zack Rusin [Wed, 23 Dec 2009 17:40:19 +0000 (12:40 -0500)]
python/gs: fix the example

14 years agogallium: add an inline that returns number of vertices per primitive
Zack Rusin [Wed, 23 Dec 2009 17:39:21 +0000 (12:39 -0500)]
gallium: add an inline that returns number of vertices per primitive

14 years agosoftpipe/gs: don't crash with null shader
Zack Rusin [Wed, 23 Dec 2009 17:34:34 +0000 (12:34 -0500)]
softpipe/gs: don't crash with null shader

14 years agogs: fix drivers so they work with geometry shaders
Zack Rusin [Sat, 19 Dec 2009 18:54:53 +0000 (13:54 -0500)]
gs: fix drivers so they work with geometry shaders

14 years agotgsi: make the tgsi assembly parser report line/column on error
Zack Rusin [Tue, 15 Dec 2009 14:26:51 +0000 (09:26 -0500)]
tgsi: make the tgsi assembly parser report line/column on error

14 years agogallium: add geometry shader support to gallium
Zack Rusin [Mon, 14 Dec 2009 22:11:46 +0000 (17:11 -0500)]
gallium: add geometry shader support to gallium

14 years agomklib: put usage info into usage() function
Brian Paul [Wed, 23 Dec 2009 23:55:37 +0000 (16:55 -0700)]
mklib: put usage info into usage() function

14 years agomklib: expand .a into .o files on FreeBSD, put common code into subroutines
Brian Paul [Wed, 23 Dec 2009 23:50:06 +0000 (16:50 -0700)]
mklib: expand .a into .o files on FreeBSD, put common code into subroutines

14 years agoi965g: get trivial/tri working again after edgeflag changes
Keith Whitwell [Thu, 24 Dec 2009 12:52:43 +0000 (12:52 +0000)]
i965g: get trivial/tri working again after edgeflag changes

14 years agoi965g: strict aliasing changes
Keith Whitwell [Thu, 24 Dec 2009 12:45:42 +0000 (12:45 +0000)]
i965g: strict aliasing changes

14 years agogallium/util: quieten compiler
Keith Whitwell [Thu, 24 Dec 2009 12:44:12 +0000 (12:44 +0000)]
gallium/util: quieten compiler

14 years agoi965g: calculate depth min/max
Keith Whitwell [Tue, 22 Dec 2009 10:14:59 +0000 (10:14 +0000)]
i965g: calculate depth min/max

Previously hard-wired to 0..1

14 years agonv50: support TGSI_OPCODE_CONT
Christoph Bumiller [Thu, 24 Dec 2009 12:35:55 +0000 (13:35 +0100)]
nv50: support TGSI_OPCODE_CONT

14 years agonv50: make edgeflags work
Christoph Bumiller [Thu, 24 Dec 2009 11:39:42 +0000 (12:39 +0100)]
nv50: make edgeflags work

It doesn't seem to be possible to set the egdeflag in the
vertex shader, so we need to fallback to pushing vertices
through the FIFO and use method 0x15e4 if they are used.

This only works if VP does MOV OUT[X] IN[Y] where X is the
edgeflag output, and Y is saved so we can tell the correct
input later.

The VP still writes the useless values to wasted outputs
as punishment.

14 years agoRegenerate gl_mangle.h.
Tom Fogal [Wed, 23 Dec 2009 18:24:52 +0000 (11:24 -0700)]
Regenerate gl_mangle.h.

Signed-off-by: Brian Paul <brianp@vmware.com>
14 years agollvmpipe: Install unit tests on build/xxx/bin
José Fonseca [Wed, 23 Dec 2009 15:21:56 +0000 (15:21 +0000)]
llvmpipe: Install unit tests on build/xxx/bin

14 years agoutil: Define common dynamic library extensions.
José Fonseca [Wed, 23 Dec 2009 13:23:39 +0000 (13:23 +0000)]
util: Define common dynamic library extensions.

14 years agogallium: only create pipe buffer when size is nonzero
Maarten Maathuis [Sun, 20 Dec 2009 13:03:03 +0000 (05:03 -0800)]
gallium: only create pipe buffer when size is nonzero

- This fixes a crash upon starting spring (a rts engine/game).

Signed-off-by: Maarten Maathuis <madman2003@gmail.com>
14 years agoglsl/pp: move static functions out of header file
Keith Whitwell [Wed, 23 Dec 2009 15:57:06 +0000 (15:57 +0000)]
glsl/pp: move static functions out of header file

14 years agoglsl/pp: quieten compiler about missing case statements
Keith Whitwell [Wed, 23 Dec 2009 15:56:31 +0000 (15:56 +0000)]
glsl/pp: quieten compiler about missing case statements

14 years agoi965g: Rename {pf->util_format}_is_depth_or_stencil()
Tomas Carnecky [Wed, 23 Dec 2009 15:57:17 +0000 (16:57 +0100)]
i965g: Rename {pf->util_format}_is_depth_or_stencil()

14 years agorbug: rename pf_is_compressed to util_format_is_compressed
Roland Scheidegger [Wed, 23 Dec 2009 15:55:16 +0000 (16:55 +0100)]
rbug: rename pf_is_compressed to util_format_is_compressed

14 years ago[i965] Rename {pf -> util}_format_is_depth_or_stencil()
Tomas Carnecky [Wed, 23 Dec 2009 15:40:20 +0000 (15:40 +0000)]
[i965] Rename {pf -> util}_format_is_depth_or_stencil()

The function was moved and renamed in 0bed834b.

Signed-off-by: Tomas Carnecky <tom@dbservice.com>
14 years agoprogs/tests: Fix build.
Vinson Lee [Tue, 22 Dec 2009 08:54:34 +0000 (00:54 -0800)]
progs/tests: Fix build.
(cherry picked from commit 1bf2d78b11ac9ac71f4be285963db1af9f09fe73)

14 years agointel: Replace some gen3 IS_* checks with context structure usage.
Eric Anholt [Wed, 16 Dec 2009 23:50:40 +0000 (15:50 -0800)]
intel: Replace some gen3 IS_* checks with context structure usage.

Shaves 400 bytes or so from i915_dri.so.

14 years agointel: Replace IS_965 checks with context structure usage.
Eric Anholt [Wed, 16 Dec 2009 23:42:55 +0000 (15:42 -0800)]
intel: Replace IS_965 checks with context structure usage.

Saves another 600 bytes or so of code.

14 years agointel: Replace IS_G4X() across the driver with context structure usage.
Eric Anholt [Wed, 16 Dec 2009 23:22:26 +0000 (15:22 -0800)]
intel: Replace IS_G4X() across the driver with context structure usage.

Saves ~2KB of code.

14 years agointel: Replace IS_IGDNG checks with intel->is_ironlake or needs_ff_sync.
Eric Anholt [Wed, 16 Dec 2009 22:45:50 +0000 (14:45 -0800)]
intel: Replace IS_IGDNG checks with intel->is_ironlake or needs_ff_sync.

Saves ~480 bytes of code.

14 years agomesa: Fix a NULL deref in glDeleteFragmentShaderATI(badname);
Eric Anholt [Tue, 22 Dec 2009 20:38:11 +0000 (12:38 -0800)]
mesa: Fix a NULL deref in glDeleteFragmentShaderATI(badname);

Fixes piglit ati-fs-bad-delete.  Caught by clang.

14 years agomesa: remove unnecessary store.
Eric Anholt [Tue, 22 Dec 2009 20:08:14 +0000 (12:08 -0800)]
mesa: remove unnecessary store.

14 years agomesa: Remove an unnecessary store reported by clang.
Eric Anholt [Tue, 22 Dec 2009 19:40:01 +0000 (11:40 -0800)]
mesa: Remove an unnecessary store reported by clang.

This was a workaround for a compiler warning that was showing a real
error.  The real error was later fixed.

14 years agointel: Fix leakage of active texture state in glBitmap fp metaops.
Eric Anholt [Tue, 22 Dec 2009 19:18:29 +0000 (11:18 -0800)]
intel: Fix leakage of active texture state in glBitmap fp metaops.

Noticed by clang.

14 years agoi915: Fix use of uninitialized variable in OPCODE_NOISE stub.
Eric Anholt [Tue, 22 Dec 2009 19:08:38 +0000 (11:08 -0800)]
i915: Fix use of uninitialized variable in OPCODE_NOISE stub.

We don't actually care which register is used since we're just
swizzling (0,0,0,0), but it should be a valid variable number.
Detected by clang.

14 years agomesa: Replace CLAMP_SELF() macro with more obvious CLAMP() usage.
Eric Anholt [Tue, 22 Dec 2009 19:04:32 +0000 (11:04 -0800)]
mesa: Replace CLAMP_SELF() macro with more obvious CLAMP() usage.

The same code is generated, and readers and static analyzers are
happier.

14 years agointel: Remove unused stored values reported by clang.
Eric Anholt [Tue, 22 Dec 2009 18:58:47 +0000 (10:58 -0800)]
intel: Remove unused stored values reported by clang.

14 years agomesa: Remove _mesa_exit wrapper for exit().
Eric Anholt [Tue, 22 Dec 2009 18:56:34 +0000 (10:56 -0800)]
mesa: Remove _mesa_exit wrapper for exit().

It does nothing else while being less useful than exit() because it lacks
attributes that real exit() has.

14 years agomesa: adjust OPCODE_IF/ELSE BranchTarget fields to point to ELSE/ENDIF instr.
Brian Paul [Tue, 22 Dec 2009 21:21:07 +0000 (14:21 -0700)]
mesa: adjust OPCODE_IF/ELSE BranchTarget fields to point to ELSE/ENDIF instr.

This is a little more logical.  Suggested in bug report 25654.

14 years agomesa: adjust BRK/CONT BranchTarget to always point to ENDLOOP instruction
Brian Paul [Tue, 22 Dec 2009 21:15:30 +0000 (14:15 -0700)]
mesa: adjust BRK/CONT BranchTarget to always point to ENDLOOP instruction

To be more consistant.

14 years agomesa: added some assertions in BNGLOOP/ENDLOOP cases
Brian Paul [Tue, 22 Dec 2009 19:57:31 +0000 (12:57 -0700)]
mesa: added some assertions in BNGLOOP/ENDLOOP cases

14 years agomesa: fix binary() function, printf format string
Brian Paul [Tue, 22 Dec 2009 20:28:39 +0000 (13:28 -0700)]
mesa: fix binary() function, printf format string

Need to use the constant 1ULL and 0xllx format string.  This fixes incorrect
results and a NULL pointer/parameter bug.

14 years agoi965g: fix for edgeflag changes (untested)
Roland Scheidegger [Tue, 22 Dec 2009 20:26:51 +0000 (21:26 +0100)]
i965g: fix for edgeflag changes (untested)

14 years agoMerge branch 'gallium-edgeflags'
Roland Scheidegger [Tue, 22 Dec 2009 19:54:26 +0000 (20:54 +0100)]
Merge branch 'gallium-edgeflags'

Conflicts:
src/mesa/state_tracker/st_draw.c

14 years agoscons: Set the default windows platform to be windows userspace.
José Fonseca [Fri, 18 Dec 2009 22:40:33 +0000 (22:40 +0000)]
scons: Set the default windows platform to be windows userspace.

I thought I had done this ages ago.

14 years agotgsi: Implement BREAKC in interpreter.
Michal Krol [Tue, 22 Dec 2009 10:58:45 +0000 (11:58 +0100)]
tgsi: Implement BREAKC in interpreter.

14 years agoi965g: fix bo_reference
Keith Whitwell [Tue, 22 Dec 2009 09:57:16 +0000 (09:57 +0000)]
i965g: fix bo_reference

14 years agoi965g: update for u_format changes
Keith Whitwell [Tue, 22 Dec 2009 09:52:26 +0000 (09:52 +0000)]
i965g: update for u_format changes

14 years agoMerge branch 'i965g-restart'
Keith Whitwell [Tue, 22 Dec 2009 09:40:39 +0000 (09:40 +0000)]
Merge branch 'i965g-restart'

Conflicts:
configure.ac

14 years agonv50: correct the negation of DDY sources
Christoph Bumiller [Mon, 21 Dec 2009 20:50:21 +0000 (21:50 +0100)]
nv50: correct the negation of DDY sources

The state tracker now does the correct thing, so
interpret negation normally.

14 years agoprogs/tests: Fix build.
Vinson Lee [Tue, 22 Dec 2009 08:54:34 +0000 (00:54 -0800)]
progs/tests: Fix build.

14 years agointel: Replace release info in DRIVER_DATE with "DEVELOPMENT"
Ian Romanick [Tue, 22 Dec 2009 02:46:17 +0000 (18:46 -0800)]
intel: Replace release info in DRIVER_DATE with "DEVELOPMENT"

14 years agoMerge branch 'mesa_7_7_branch'
Ian Romanick [Tue, 22 Dec 2009 02:45:31 +0000 (18:45 -0800)]
Merge branch 'mesa_7_7_branch'

Conflicts:
src/mesa/main/version.h

14 years agoAdd MD5 checksums for 7.6.1 release
Ian Romanick [Tue, 22 Dec 2009 02:32:32 +0000 (18:32 -0800)]
Add MD5 checksums for 7.6.1 release

14 years agoAdd MD5 checksums for 7.7 release
Ian Romanick [Tue, 22 Dec 2009 02:30:35 +0000 (18:30 -0800)]
Add MD5 checksums for 7.7 release

14 years agomesa: set version string to 7.7
Ian Romanick [Tue, 22 Dec 2009 02:28:32 +0000 (18:28 -0800)]
mesa: set version string to 7.7

14 years agointel: Bump driver date to reflect status as final Q4 driver RC
Ian Romanick [Tue, 22 Dec 2009 02:27:50 +0000 (18:27 -0800)]
intel: Bump driver date to reflect status as final Q4 driver RC

14 years agoMerge branch 'mesa_7_6_branch' into mesa_7_7_branch
Ian Romanick [Tue, 22 Dec 2009 02:27:24 +0000 (18:27 -0800)]
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch

Conflicts:
scons/gallium.py
scons/generic.py
src/mesa/main/version.h

14 years agomesa: set version string to 7.6.1
Ian Romanick [Tue, 22 Dec 2009 02:25:30 +0000 (18:25 -0800)]
mesa: set version string to 7.6.1

14 years agoglsl: assorted clean-ups in slang_compile.c
Brian Paul [Tue, 22 Dec 2009 01:04:27 +0000 (18:04 -0700)]
glsl: assorted clean-ups in slang_compile.c

14 years agoprogs/perf: Fix MSVC build.
Vinson Lee [Sat, 10 Oct 2009 16:45:16 +0000 (10:45 -0600)]
progs/perf: Fix MSVC build.
(cherry picked from commit cbf46ed670ef5a5c8a641730234dd7ae964c3170)

14 years agomesa: Fix missing finite symbol error on Windows.
José Fonseca [Thu, 24 Sep 2009 11:36:11 +0000 (12:36 +0100)]
mesa: Fix missing finite symbol error on Windows.

Caused by some weird logic regarding the __WIN32__ define which made
the finite definition dependent on the header include order.
(cherry picked from commit 622bdecabd73167d2f2f3aff0e223a8c64433f99)

14 years agomesa: Include <unistd.h> only when one is available.
Michal Krol [Mon, 7 Sep 2009 07:31:17 +0000 (09:31 +0200)]
mesa: Include <unistd.h> only when one is available.
(cherry picked from commit 970823978c2f7d2cf0757aa6ddbd6289b34c476f)

14 years agodarwin: Build glsl
Jeremy Huddleston [Tue, 22 Dec 2009 01:48:59 +0000 (17:48 -0800)]
darwin: Build glsl
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
14 years agoosmesa: Fix a copy/paste error in building libOSMesa
Jeremy Huddleston [Tue, 22 Dec 2009 01:48:35 +0000 (17:48 -0800)]
osmesa: Fix a copy/paste error in building libOSMesa

Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
14 years agoMerge branch 'mesa_7_7_branch'
Brian Paul [Tue, 22 Dec 2009 01:35:54 +0000 (18:35 -0700)]
Merge branch 'mesa_7_7_branch'

Conflicts:
src/mesa/main/version.h
src/mesa/state_tracker/st_atom_shader.c