Commit Graph

45327 Commits

Author SHA1 Message Date
Brian Paul
8f6c207024 u_upload_mgr: add missing offset to src map in u_upload_buffer()
Fixes regression from dda8d7ac3f
2011-07-12 09:48:01 -06:00
Emil Velikov
1ab5e15242 st/mesa: check if _mesa_create_context() returns NULL
In some cases _mesa_create_context() can return NULL an in the mesa
state tracker, we do not concider the case, which may cause issues
within st_create_context_priv()

This patch adds a simple check (similar to the one in the dri drivers)

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Signed-off-by: Brian Paul <brianp@vmware.com>
2011-07-12 08:30:15 -06:00
Christian König
5e5d7acc2f vaapi: cleanup the source and let the st at least compile again 2011-07-12 11:08:12 +02:00
Emil Velikov
4ef9c3d21b autoconf: Do not select Xlib when building DRI
As Chia-I Wu said 'There are two libGL providers, Xlib and DRI based
they cannot coexist'

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Signed-off-by: Marek Olšák <maraeo@gmail.com>
2011-07-12 01:38:28 +02:00
Marek Olšák
c369fb42ee st/mesa: choose a matching depth internal format for DrawPixels
This makes it easier to hit the fast path and get a float format
when we ask for it.

Reviewed-by: Brian Paul <brianp@vmware.com>
2011-07-12 01:32:23 +02:00
Christian König
efc7fda462 [g3dvl] add some more PIPE_VIDEO_CAPs 2011-07-12 00:12:12 +02:00
Ian Romanick
db311b45be configure.ac: Make --{without,with}-gallium-drivers work as expected
This version is mostly Dan's post to the mesa-dev mailing list on
6/22/2011.

NOTE: This is a candidate for the 7.10 and 7.11 branches.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
2011-07-11 15:02:16 -07:00
Marek Olšák
2df4b6117b st/mesa: get rid of unnecessary 'goto' in DrawPixels
Reviewed-by: Brian Paul <brianp@vmware.com>
2011-07-11 23:45:01 +02:00
Marek Olšák
ab4d629613 st/mesa: derive a stencil sampler format from the actual texture format
Reviewed-by: Brian Paul <brianp@vmware.com>
2011-07-11 23:45:01 +02:00
Vinson Lee
1844ae7e7e gallivm: Re-enable LLVMUnionTypeKind case for llvm-2.7 only.
LLVMUnionTypeKind is not in llvm-2.6, llvm-2.8, llvm-2.9, or llvm-3.0svn.
2011-07-11 14:08:24 -07:00
Andrew Randrianasulu
a09b7f7f15 dri/nouveau: nv10: fix vertex format for GL_UNSIGNED_BYTE
Broken accidentally in f4efc256fd,
the switch to rnn headers.

NV10TCL_VTXFMT_TYPE_BYTE_RGBA became U8_UNORM but B8G8R8A8_UNORM
was used instead.
2011-07-11 22:12:13 +02:00
David Heidelberger
278b832b78 nvfx: handle PIPE_CAP_SM3
Signed-off-by: David Heidelberger <d.okias@gmail.com>
2011-07-11 21:52:24 +02:00
Vinson Lee
e4189f2e2e gallivm: Remove LLVMOpaqueKindType case with llvm-3.0.
llvm-3.0svn r134829 removed LLVMOpaqueKindType from enum LLVMTypeKind in
include/llvm-c/Core.h.
2011-07-11 12:48:06 -07:00
Kenneth Graunke
7304909d65 glsl: Reject ambiguous function calls (multiple inexact matches).
According to the GLSL 1.20 specification, "it is a semantic error if
there are multiple ways to apply [implicit] conversions [...] such that
the call can be made to match multiple signatures."

Fixes a regression caused by 60eb63a855,
which implemented the wrong policy of finding a "closest" match.
However, this is not a revert, since the original code failed to
continue looking for an exact match once it found two inexact matches.

It's OK to have multiple inexact matches if there's also an exact match.

NOTE: This is a candidate for the 7.10 and 7.11 branches.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=38971
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
2011-07-11 10:53:28 -07:00
Kenneth Graunke
186e37c754 i965/gen7: Add support for gl_PointCoord.
This is exactly analogous to Eric's Gen6 change in commit
6861a70177.  His explanation:

"This is just like PointSprite overrides, but it's always on for that
 attribute."

Fixes glsl-fs-pointcoord and gtf/point_sprites.

Signed-off-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>

NOTE: This is a candidate for the 7.11 branch.
2011-07-11 10:46:35 -07:00
Kenneth Graunke
147d010295 i965/gen7: Fix point sprite texture coordinate overrides.
This is exactly analogous to Eric's Gen6 change in commit
f304bb8a5d.  His explanation:

"We were assuming that the input attribute n to the FS was
 FRAG_ATTRIB_TEXn, which happened to be true often enough for our
 testcases."

Signed-off-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>

NOTE: This is a candidate for the 7.11 branch.
2011-07-11 10:46:35 -07:00
Kenneth Graunke
5edb3ddf41 i965/gen7: Refactor SF setup a bit to handle overrides in one place.
This is exactly analogous to Eric's Gen6 change in commit
e7280b16d6.

Signed-off-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>

NOTE: This is a candidate for the 7.11 branch.
2011-07-11 10:46:35 -07:00
Eric Anholt
f07cfebebe i965/gen4: Add a stub dumper for CC unit state, which is different from gen6.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2011-07-11 09:27:27 -07:00
Eric Anholt
f7f03fb588 i965/gen4: Add state dumping for unit state using state_batch_list[].
This is just barely more pretty-printing than we previously had, but
at least it doesn't leave out unit states in the log.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2011-07-11 09:27:27 -07:00
Eric Anholt
a1226bcd20 i965/gen6: Add state dumping for the VS constants.
This is quite a bit of spam, but I think it's useful to have in a full
INTEL_DEBUG=batch dump.  And a lot of this spam on glxgears is just
because we're awful at handling our constants :/

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2011-07-11 09:27:27 -07:00
Eric Anholt
6e17a01e42 i965/gen6: Add state dumping for the scissor packet.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2011-07-11 09:27:27 -07:00
Eric Anholt
93c7a5da11 i965: When dumping programs, dump the whole cache. But don't by default.
The previous brw_state_dump output was rather useless -- last used
program per batch, and just the hex.  Now we dump all programs (since
we don't know which were used), and disassemble them.  But that's a
ton of spam, and usually when looking into program contents we use
INTEL_DEBUG={vs,wm,misc,other} and when looking into state updates we
use INTEL_DEBUG=batch, so this dump usually just massively clutters up
the output.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2011-07-11 09:27:26 -07:00
Eric Anholt
6bbaa7c0e5 i965: Dump the binding table using state_batch_list[].
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2011-07-11 09:27:26 -07:00
Eric Anholt
13e82ece6d i965: Dump the surface, sampler, and sdc state using state_batch_list[].
Now, for example, INTEL_DEBUG=batch tex-border-1 shows all the
texturing state involved.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2011-07-11 09:27:26 -07:00
Eric Anholt
709a7af2af i965: Dump brw_state_batch data in an easier format for cross-referencing.
Now that we're using state base addresses for most things, we're less
interested in the absolute address of the state, and more in its
offset from the state base address (start of batchbuffer).  Also,
reorder the printout so it looks more like the batchbuffer dump.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2011-07-11 09:27:26 -07:00
Eric Anholt
d484667423 i965: Map the batch once for dumping all our state batch structs.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2011-07-11 09:27:26 -07:00
Eric Anholt
00f07b33ec i965: Move the new gen6 state structs to using state_batch_list[].
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2011-07-11 09:27:26 -07:00
Eric Anholt
fbfeff73f3 i965: Move the SF VP state dump to using the state_batch_list[]
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2011-07-11 09:27:26 -07:00
Eric Anholt
2a8d744345 i965: Move CLIP VP state dump to using the state_batch_list[].
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2011-07-11 09:27:26 -07:00
Eric Anholt
65c6de000e i965: Track the brw_state_batch() data while under INTEL_DEBUG=batch.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2011-07-11 09:27:26 -07:00
Eric Anholt
d375df220f i965: Add a type argument to brw_state_batch().
I want to make brw_state_dump.c handle more than just the last
statechange, so I want to keep track of what's in the batch state.  By
using AUB file numbering for most of these packets, this may be
reusable for aub dumping.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2011-07-11 09:27:26 -07:00
Eric Anholt
35d5d5df72 intel: Make our context structure be a ralloc context.
This will let me hang cached compiler structs off of the context
without having to worry about cleaning them up at destroy time.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2011-07-11 09:27:26 -07:00
Brian Paul
be8551220c configs: do not let llvm-config define NDEBUG in debug builds
Following the examples of Marek and Jose for autoconf and scons.
2011-07-11 10:07:43 -06:00
Eric Anholt
a166720f2d ir_to_mesa: typo fix in a comment. 2011-07-11 08:58:37 -07:00
Eric Anholt
46a7639174 i965: Fix fp-dst-aliasing-[12].vpfp.
There's no pretty way to avoid the overwriting of the src operands, so
just use a temporary destination and rely on the MOV optimization.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2011-07-11 08:58:37 -07:00
Eric Anholt
e3ea5bc08e i965: Fix fp-lit-src-equals-dst.
We were stomping over the source for the body of the LIT instruction
when doing the MOV of 1.0 to the uninteresting channels.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2011-07-11 08:58:37 -07:00
Marek Olšák
be039d296d configure.ac: do not let llvm-config define NDEBUG in debug builds
Re-enables assertions in src/mesa.
2011-07-11 17:32:06 +02:00
José Fonseca
acf82194ce scons: Filter-out NDEBUG define from llvm-config.
Based on a similar autoconf change from Marek.
2011-07-11 15:38:06 +01:00
Christian König
df5e0b9435 [g3dvl] fix a whole bunch of memory leaks 2011-07-11 16:29:02 +02:00
Brian Paul
d60880db35 glx: add a few missing glXChooseFBConfig() attributes
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=38842

NOTE: This is a candidate for the 7.11 branch.
2011-07-11 08:02:49 -06:00
Brian Paul
bb0d5cae00 glext.h: update to version 71 2011-07-11 08:02:48 -06:00
Marek Olšák
6c53d75e7d mesa: fix assertion failure in delete_wrapper 2011-07-11 15:32:34 +02:00
Marek Olšák
ceb04b32ba mesa: add a comment in _mesa_test_formats 2011-07-11 15:18:14 +02:00
Christian König
a7ec477ebc [g3dvl] revert some unintended white space changes 2011-07-11 14:36:03 +02:00
Marek Olšák
e134eaa2c5 mesa: fix assertion failure in _mesa_test_formats
Z32_FLOAT_X24S8 has DataType of GL_NONE.
2011-07-11 14:32:32 +02:00
Christian König
3d1057f243 [g3dvl] sync SConscript with Makefile 2011-07-11 13:55:56 +02:00
Christian König
96718d98de [g3dvl] softpipe is no longer needed for dri-nouveau 2011-07-11 12:31:54 +02:00
Christian König
358795bc0b r600g: revert "support textures with scaled number formats"
We should add those probably when merged to master.
2011-07-11 11:39:11 +02:00
Christian König
d6eb1f8257 pipe-video: merge fixes 2011-07-11 11:28:23 +02:00
Christian König
e45d895824 [g3dvl] remove some stale nv40 files 2011-07-11 11:08:45 +02:00