mesa.git
13 years agomesa: split _mesa_reference_program() into hot/cold paths.
Dave Airlie [Thu, 14 Jul 2011 14:09:21 +0000 (08:09 -0600)]
mesa: split _mesa_reference_program() into hot/cold paths.

inline the hotpath of the reference remaining the same. This shouldn't
penalise the slow path at all but improve the hot path so we don't have
to jump to the function.

It also moves some assert checks under an #ifndef NDEBUG.

Minor clean-ups added by Brian.

Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Brian Paul <brianp@vmware.com>
13 years agog3dvl: check for existense of VA API header/libs
Christian König [Thu, 14 Jul 2011 12:09:25 +0000 (14:09 +0200)]
g3dvl: check for existense of VA API header/libs

Building the VA state tracker only works when the header/libs are available.
Also add a warning that the state tracker is currently undmaintained.

13 years agog3dvl: check for existense of VDPAU header/libs
Christian König [Thu, 14 Jul 2011 11:57:23 +0000 (13:57 +0200)]
g3dvl: check for existense of VDPAU header/libs

Building the VDPAU state tracker only works when the header/libs are available.

13 years agog3dvl: check for existense of XvMC header/libs
Christian König [Thu, 14 Jul 2011 10:42:17 +0000 (12:42 +0200)]
g3dvl: check for existense of XvMC header/libs

Building the XvMC state tracker only works when the header/libs are available.

13 years agonv50,nvc0: extensive surface format renaming to get consistency
Christoph Bumiller [Mon, 11 Jul 2011 09:33:11 +0000 (11:33 +0200)]
nv50,nvc0: extensive surface format renaming to get consistency

Now the component ordering is consistent and matches gallium again.

13 years agonv50,nvc0: add support for multi-sample resources
Christoph Bumiller [Mon, 11 Jul 2011 16:02:27 +0000 (18:02 +0200)]
nv50,nvc0: add support for multi-sample resources

13 years agonv50,nvc0: add correct storage type for Z32_FLOAT
Christoph Bumiller [Mon, 11 Jul 2011 20:49:57 +0000 (22:49 +0200)]
nv50,nvc0: add correct storage type for Z32_FLOAT

13 years agonv50,nvc0: unify nvc0_miptree and nv50_miptree structs
Christoph Bumiller [Thu, 14 Jul 2011 10:40:04 +0000 (12:40 +0200)]
nv50,nvc0: unify nvc0_miptree and nv50_miptree structs

Share some functions and restructure miptree creation a little.
Prepare for multi-sample resources.

13 years agonv50,nvc0: don't advertise unaligned texture format support
Christoph Bumiller [Mon, 11 Jul 2011 09:31:18 +0000 (11:31 +0200)]
nv50,nvc0: don't advertise unaligned texture format support

Because we don't support them.
For instance, R32G32B32 is not R32G32B32X32 as was assumed.

Add support for R8G8B8X8_UNORM instead of R8G8B8_UNORM surfaces.

13 years agog3dvl: Remove non-constant expression array initializers.
Vinson Lee [Thu, 14 Jul 2011 04:57:50 +0000 (21:57 -0700)]
g3dvl: Remove non-constant expression array initializers.

The array initializer must be a constant expression in MSVC.

13 years agoconfigure.ac: don't build gallium driver libs just to see if there are no errors
Marek Olšák [Mon, 27 Jun 2011 06:02:31 +0000 (08:02 +0200)]
configure.ac: don't build gallium driver libs just to see if there are no errors

I think the past are those times when the gallium interface was changed all
the time. Now it is not, so there is no reason to always compile the libs
if they are not needed.

13 years agogallium/targets: do not link every driver with libllvmpipe.a
Marek Olšák [Mon, 27 Jun 2011 06:25:09 +0000 (08:25 +0200)]
gallium/targets: do not link every driver with libllvmpipe.a

Only some targets need that, the others don't.

13 years agoRename swrastg_dri to swrast_dri
Marek Olšák [Mon, 27 Jun 2011 01:25:30 +0000 (03:25 +0200)]
Rename swrastg_dri to swrast_dri

I prefer it this way and it has been suggested earlier by others too.
Opinions?

13 years agosoftpipe: fix various warnings about int/float/double conversions, etc
Brian Paul [Thu, 14 Jul 2011 00:54:15 +0000 (18:54 -0600)]
softpipe: fix various warnings about int/float/double conversions, etc

13 years agog3dvl: Remove designated initializers.
Vinson Lee [Thu, 14 Jul 2011 00:00:26 +0000 (17:00 -0700)]
g3dvl: Remove designated initializers.

MSVC does not support designated initializers.

13 years agog3dvl: s/inline/INLINE/
Vinson Lee [Wed, 13 Jul 2011 22:59:08 +0000 (15:59 -0700)]
g3dvl: s/inline/INLINE/

The inline keyword is not available in MSVC C.

13 years agoutils: Add missing parentheses
Emil Velikov [Wed, 13 Jul 2011 22:19:37 +0000 (23:19 +0100)]
utils: Add missing parentheses

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Signed-off-by: Brian Paul <brianp@vmware.com>
13 years agosoftpipe: Remove sp_video_context.c from SConscript.
Vinson Lee [Wed, 13 Jul 2011 21:50:12 +0000 (14:50 -0700)]
softpipe: Remove sp_video_context.c from SConscript.

sp_video_context.c was added to SConscript in commit
ed24e19070b7dff12670151b2d184f31c845ccae (pipe-video merge) but no file
of that name was added.

13 years ago[g3dvl] don't upload all quant buffer layers at once
Christian König [Wed, 13 Jul 2011 21:33:20 +0000 (23:33 +0200)]
[g3dvl] don't upload all quant buffer layers at once

There seems to be a bug in r600g when uploading more than one layer of a
3D resource at once with a hardware blit.

So just do them one at a time to workaround this.

13 years agoMerge branch 'pipe-video'
Christian König [Wed, 13 Jul 2011 20:56:06 +0000 (22:56 +0200)]
Merge branch 'pipe-video'

13 years agoi915g: don't try to check if a NULL buffer is busy.
Stéphane Marchesin [Wed, 13 Jul 2011 18:59:10 +0000 (11:59 -0700)]
i915g: don't try to check if a NULL buffer is busy.

13 years agoMerge branch 'master' of ssh://git.freedesktop.org/git/mesa/mesa
Stéphane Marchesin [Wed, 13 Jul 2011 18:56:44 +0000 (11:56 -0700)]
Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/mesa

13 years agost/mesa: flush bitmap cache on query and conditional render boundaries
Vadim Girlin [Wed, 13 Jul 2011 05:01:04 +0000 (09:01 +0400)]
st/mesa: flush bitmap cache on query and conditional render boundaries

Bitmap caching shouldn't affect the results of the queries and
conditional render.

NOTE: This is a candidate for the 7.11 branch.

Signed-off-by: Vadim Girlin <vadimgirlin@gmail.com>
Signed-off-by: Brian Paul <brianp@vmware.com>
13 years ago[g3dvl] remove some unneeded Makefiles
Christian König [Wed, 13 Jul 2011 17:37:28 +0000 (19:37 +0200)]
[g3dvl] remove some unneeded Makefiles

13 years agor600g: reenable hardware blits for STATIC and IMMUTABLE resources
Christian König [Wed, 13 Jul 2011 15:05:58 +0000 (17:05 +0200)]
r600g: reenable hardware blits for STATIC and IMMUTABLE resources

Getting the driver in sync with mainline.

13 years agor600g: prevent hardware blitting based on resource usage
Christian König [Wed, 13 Jul 2011 14:35:19 +0000 (16:35 +0200)]
r600g: prevent hardware blitting based on resource usage

It doesn't make much sense for STAGING and STREAM resources to be
hardware blitted into VRAM.

13 years ago[g3dvl] implement workaround for missing blender clamp control
Christian König [Wed, 13 Jul 2011 14:07:30 +0000 (16:07 +0200)]
[g3dvl] implement workaround for missing blender clamp control

It's about 20% slower, but should at least work with every hardware.

13 years agor600g: revert "set BLEND_CLAMP depending on clamp_fragment_color"
Christian König [Wed, 13 Jul 2011 13:54:28 +0000 (15:54 +0200)]
r600g: revert "set BLEND_CLAMP depending on clamp_fragment_color"

BLEND_CLAMP doesn't seems to be the right way to implement "ARB_color_buffer_float".

13 years ago[g3dvl] keep a pointer in idct buffer to idct object
Christian König [Wed, 13 Jul 2011 13:01:40 +0000 (15:01 +0200)]
[g3dvl] keep a pointer in idct buffer to idct object

So we always know to which idct object a buffer belongs

13 years agotargets/egl-static: fix a linking error
Chia-I Wu [Wed, 13 Jul 2011 07:25:46 +0000 (15:25 +0800)]
targets/egl-static: fix a linking error

rbug is always linked in and it needs libpthread.

13 years agoi915: Add support for gl_FragData[0] for output color.
Eric Anholt [Tue, 12 Jul 2011 22:31:39 +0000 (15:31 -0700)]
i915: Add support for gl_FragData[0] for output color.

We advertised ARB_draw_buffers, but either fell back to software when
using this output, or assertion failed.  Fixes glsl-fs-fragdata-1, and
failures in some webgl conformance tests.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=39024
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=34906

13 years agoi915g: fixup context desdruction
Daniel Vetter [Tue, 12 Jul 2011 22:09:36 +0000 (00:09 +0200)]
i915g: fixup context desdruction

Reported-by: Christopher Egert <cme3000@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
13 years agoi915: Fix NPOT compressed textures on 915.
Eric Anholt [Mon, 11 Jul 2011 23:50:06 +0000 (16:50 -0700)]
i915: Fix NPOT compressed textures on 915.

We were failing at rounding, misplacing the non-baselevels.  Fixes:
3DFX_texture_compression_FXT1/fbo-generate-mipmaps
ARB_texture_compression/fbo-generate-mipmaps
EXT_texture_compression_s3tc/fbo-generate-mipmaps

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
13 years agomesa: Fix assertion failure in X8_Z24/Z24_X8 texfetch.
Eric Anholt [Mon, 11 Jul 2011 23:49:44 +0000 (16:49 -0700)]
mesa: Fix assertion failure in X8_Z24/Z24_X8 texfetch.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
13 years agoi915: Fix depth texturing since 86e62b2357447b7c97f434be4834f4b50aa0764d
Eric Anholt [Mon, 11 Jul 2011 18:42:00 +0000 (11:42 -0700)]
i915: Fix depth texturing since 86e62b2357447b7c97f434be4834f4b50aa0764d

The 965 driver already had the X8_Z24 case, but 915 was missing it.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
13 years agoi915: Use _mesa_get_format_name to describe translate_tex_format() fail.
Eric Anholt [Mon, 11 Jul 2011 18:34:56 +0000 (11:34 -0700)]
i915: Use _mesa_get_format_name to describe translate_tex_format() fail.

I don't want to go count up to what format number 29 is.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
13 years agoi915: Fix map/unmap mismatches from leaving INTEL_FALLBACK during TNL.
Eric Anholt [Mon, 11 Jul 2011 18:32:04 +0000 (11:32 -0700)]
i915: Fix map/unmap mismatches from leaving INTEL_FALLBACK during TNL.

The first rendering after context create didn't know of the color
buffer yet, triggering a sw fallback.  The intel_prepare_render() from
intelSpanRenderStart then found the buffer and turned off fallbacks,
but intelSpanRenderFinish was never called and things were left
mapped.  By checking buffers before making the call on whether to do
the fallback pipeline or not, we avoid the fallback change inside of
the rendering pipeline.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=31561
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
13 years agointel: Use _mesa_tex_target_to_face() helper function instead of our own.
Eric Anholt [Mon, 11 Jul 2011 17:29:38 +0000 (10:29 -0700)]
intel: Use _mesa_tex_target_to_face() helper function instead of our own.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
13 years agor600g: emit SQ_LDS_RESOURCE_MGMT
Alex Deucher [Tue, 12 Jul 2011 16:00:10 +0000 (12:00 -0400)]
r600g: emit SQ_LDS_RESOURCE_MGMT

Need to be initialized to a reasonable value as
compute code may change it.

Fixes:
https://bugs.freedesktop.org/show_bug.cgi?id=39119

NOTE: This is a candidate for the 7.11 branch.

Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
13 years agou_upload_mgr: add missing offset to src map in u_upload_buffer()
Brian Paul [Tue, 12 Jul 2011 15:47:48 +0000 (09:47 -0600)]
u_upload_mgr: add missing offset to src map in u_upload_buffer()

Fixes regression from dda8d7ac3f0e5148d9738a57f7bc03216f6514d1

13 years agost/mesa: check if _mesa_create_context() returns NULL
Emil Velikov [Mon, 11 Jul 2011 14:42:15 +0000 (15:42 +0100)]
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>
13 years agovaapi: cleanup the source and let the st at least compile again
Christian König [Tue, 12 Jul 2011 09:08:12 +0000 (11:08 +0200)]
vaapi: cleanup the source and let the st at least compile again

13 years agoautoconf: Do not select Xlib when building DRI
Emil Velikov [Mon, 11 Jul 2011 14:58:29 +0000 (15:58 +0100)]
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>
13 years agost/mesa: choose a matching depth internal format for DrawPixels
Marek Olšák [Mon, 11 Jul 2011 21:38:49 +0000 (23:38 +0200)]
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>
13 years ago[g3dvl] add some more PIPE_VIDEO_CAPs
Christian König [Mon, 11 Jul 2011 22:12:12 +0000 (00:12 +0200)]
[g3dvl] add some more PIPE_VIDEO_CAPs

13 years agoconfigure.ac: Make --{without,with}-gallium-drivers work as expected
Ian Romanick [Wed, 22 Jun 2011 18:35:27 +0000 (11:35 -0700)]
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>
13 years agost/mesa: get rid of unnecessary 'goto' in DrawPixels
Marek Olšák [Mon, 11 Jul 2011 16:32:48 +0000 (18:32 +0200)]
st/mesa: get rid of unnecessary 'goto' in DrawPixels

Reviewed-by: Brian Paul <brianp@vmware.com>
13 years agost/mesa: derive a stencil sampler format from the actual texture format
Marek Olšák [Mon, 11 Jul 2011 17:54:27 +0000 (19:54 +0200)]
st/mesa: derive a stencil sampler format from the actual texture format

Reviewed-by: Brian Paul <brianp@vmware.com>
13 years agogallivm: Re-enable LLVMUnionTypeKind case for llvm-2.7 only.
Vinson Lee [Mon, 11 Jul 2011 21:08:24 +0000 (14:08 -0700)]
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.

13 years agodri/nouveau: nv10: fix vertex format for GL_UNSIGNED_BYTE
Andrew Randrianasulu [Mon, 11 Jul 2011 20:05:13 +0000 (22:05 +0200)]
dri/nouveau: nv10: fix vertex format for GL_UNSIGNED_BYTE

Broken accidentally in f4efc256fd90beaff86321e4c6ce00f9be55092d,
the switch to rnn headers.

NV10TCL_VTXFMT_TYPE_BYTE_RGBA became U8_UNORM but B8G8R8A8_UNORM
was used instead.

13 years agonvfx: handle PIPE_CAP_SM3
David Heidelberger [Mon, 11 Jul 2011 19:50:24 +0000 (21:50 +0200)]
nvfx: handle PIPE_CAP_SM3

Signed-off-by: David Heidelberger <d.okias@gmail.com>
13 years agogallivm: Remove LLVMOpaqueKindType case with llvm-3.0.
Vinson Lee [Mon, 11 Jul 2011 19:48:06 +0000 (12:48 -0700)]
gallivm: Remove LLVMOpaqueKindType case with llvm-3.0.

llvm-3.0svn r134829 removed LLVMOpaqueKindType from enum LLVMTypeKind in
include/llvm-c/Core.h.

13 years agoglsl: Reject ambiguous function calls (multiple inexact matches).
Kenneth Graunke [Sat, 9 Jul 2011 07:20:34 +0000 (00:20 -0700)]
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 60eb63a855cb89962f2d5bb91e238ff2d1ab8702,
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>
13 years agoi965/gen7: Add support for gl_PointCoord.
Kenneth Graunke [Wed, 29 Jun 2011 22:18:55 +0000 (15:18 -0700)]
i965/gen7: Add support for gl_PointCoord.

This is exactly analogous to Eric's Gen6 change in commit
6861a701772eac3a6a7d3136d03efa7ac7e5c026.  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.

13 years agoi965/gen7: Fix point sprite texture coordinate overrides.
Kenneth Graunke [Wed, 29 Jun 2011 22:11:22 +0000 (15:11 -0700)]
i965/gen7: Fix point sprite texture coordinate overrides.

This is exactly analogous to Eric's Gen6 change in commit
f304bb8a5d040d99db47a65813d216d11c66fb47.  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.

13 years agoi965/gen7: Refactor SF setup a bit to handle overrides in one place.
Kenneth Graunke [Wed, 29 Jun 2011 22:05:52 +0000 (15:05 -0700)]
i965/gen7: Refactor SF setup a bit to handle overrides in one place.

This is exactly analogous to Eric's Gen6 change in commit
e7280b16d634e1f434bebbce83996b3d30d0419c.

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.

13 years agoi965/gen4: Add a stub dumper for CC unit state, which is different from gen6.
Eric Anholt [Fri, 8 Jul 2011 21:15:57 +0000 (14:15 -0700)]
i965/gen4: Add a stub dumper for CC unit state, which is different from gen6.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
13 years agoi965/gen4: Add state dumping for unit state using state_batch_list[].
Eric Anholt [Fri, 8 Jul 2011 21:09:47 +0000 (14:09 -0700)]
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>
13 years agoi965/gen6: Add state dumping for the VS constants.
Eric Anholt [Fri, 8 Jul 2011 20:35:42 +0000 (13:35 -0700)]
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>
13 years agoi965/gen6: Add state dumping for the scissor packet.
Eric Anholt [Fri, 8 Jul 2011 20:02:28 +0000 (13:02 -0700)]
i965/gen6: Add state dumping for the scissor packet.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
13 years agoi965: When dumping programs, dump the whole cache. But don't by default.
Eric Anholt [Thu, 23 Jun 2011 00:11:00 +0000 (17:11 -0700)]
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>
13 years agoi965: Dump the binding table using state_batch_list[].
Eric Anholt [Thu, 23 Jun 2011 00:01:03 +0000 (17:01 -0700)]
i965: Dump the binding table using state_batch_list[].

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
13 years agoi965: Dump the surface, sampler, and sdc state using state_batch_list[].
Eric Anholt [Wed, 22 Jun 2011 23:53:06 +0000 (16:53 -0700)]
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>
13 years agoi965: Dump brw_state_batch data in an easier format for cross-referencing.
Eric Anholt [Wed, 22 Jun 2011 23:10:56 +0000 (16:10 -0700)]
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>
13 years agoi965: Map the batch once for dumping all our state batch structs.
Eric Anholt [Wed, 22 Jun 2011 23:12:29 +0000 (16:12 -0700)]
i965: Map the batch once for dumping all our state batch structs.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
13 years agoi965: Move the new gen6 state structs to using state_batch_list[].
Eric Anholt [Wed, 22 Jun 2011 23:03:05 +0000 (16:03 -0700)]
i965: Move the new gen6 state structs to using state_batch_list[].

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
13 years agoi965: Move the SF VP state dump to using the state_batch_list[]
Eric Anholt [Wed, 22 Jun 2011 22:58:50 +0000 (15:58 -0700)]
i965: Move the SF VP state dump to using the state_batch_list[]

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
13 years agoi965: Move CLIP VP state dump to using the state_batch_list[].
Eric Anholt [Wed, 22 Jun 2011 22:56:07 +0000 (15:56 -0700)]
i965: Move CLIP VP state dump to using the state_batch_list[].

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
13 years agoi965: Track the brw_state_batch() data while under INTEL_DEBUG=batch.
Eric Anholt [Wed, 22 Jun 2011 22:48:09 +0000 (15:48 -0700)]
i965: Track the brw_state_batch() data while under INTEL_DEBUG=batch.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
13 years agoi965: Add a type argument to brw_state_batch().
Eric Anholt [Wed, 22 Jun 2011 22:14:20 +0000 (15:14 -0700)]
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>
13 years agointel: Make our context structure be a ralloc context.
Eric Anholt [Fri, 6 May 2011 02:01:25 +0000 (19:01 -0700)]
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>
13 years agoconfigs: do not let llvm-config define NDEBUG in debug builds
Brian Paul [Mon, 11 Jul 2011 16:07:32 +0000 (10:07 -0600)]
configs: do not let llvm-config define NDEBUG in debug builds

Following the examples of Marek and Jose for autoconf and scons.

13 years agoir_to_mesa: typo fix in a comment.
Eric Anholt [Mon, 2 May 2011 17:45:02 +0000 (10:45 -0700)]
ir_to_mesa: typo fix in a comment.

13 years agoi965: Fix fp-dst-aliasing-[12].vpfp.
Eric Anholt [Fri, 8 Jul 2011 00:08:04 +0000 (17:08 -0700)]
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>
13 years agoi965: Fix fp-lit-src-equals-dst.
Eric Anholt [Thu, 7 Jul 2011 23:41:20 +0000 (16:41 -0700)]
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>
13 years agoconfigure.ac: do not let llvm-config define NDEBUG in debug builds
Marek Olšák [Mon, 11 Jul 2011 12:33:21 +0000 (14:33 +0200)]
configure.ac: do not let llvm-config define NDEBUG in debug builds

Re-enables assertions in src/mesa.

13 years agoscons: Filter-out NDEBUG define from llvm-config.
José Fonseca [Mon, 11 Jul 2011 14:36:40 +0000 (15:36 +0100)]
scons: Filter-out NDEBUG define from llvm-config.

Based on a similar autoconf change from Marek.

13 years ago[g3dvl] fix a whole bunch of memory leaks
Christian König [Mon, 11 Jul 2011 14:29:02 +0000 (16:29 +0200)]
[g3dvl] fix a whole bunch of memory leaks

13 years agoglx: add a few missing glXChooseFBConfig() attributes
Brian Paul [Mon, 11 Jul 2011 14:00:59 +0000 (08:00 -0600)]
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.

13 years agoglext.h: update to version 71
Brian Paul [Fri, 8 Jul 2011 18:59:20 +0000 (12:59 -0600)]
glext.h: update to version 71

13 years agomesa: fix assertion failure in delete_wrapper
Marek Olšák [Mon, 11 Jul 2011 13:26:51 +0000 (15:26 +0200)]
mesa: fix assertion failure in delete_wrapper

13 years agomesa: add a comment in _mesa_test_formats
Marek Olšák [Mon, 11 Jul 2011 13:18:14 +0000 (15:18 +0200)]
mesa: add a comment in _mesa_test_formats

13 years ago[g3dvl] revert some unintended white space changes
Christian König [Mon, 11 Jul 2011 12:36:03 +0000 (14:36 +0200)]
[g3dvl] revert some unintended white space changes

13 years agomesa: fix assertion failure in _mesa_test_formats
Marek Olšák [Mon, 11 Jul 2011 11:53:42 +0000 (13:53 +0200)]
mesa: fix assertion failure in _mesa_test_formats

Z32_FLOAT_X24S8 has DataType of GL_NONE.

13 years ago[g3dvl] sync SConscript with Makefile
Christian König [Mon, 11 Jul 2011 11:55:56 +0000 (13:55 +0200)]
[g3dvl] sync SConscript with Makefile

13 years ago[g3dvl] softpipe is no longer needed for dri-nouveau
Christian König [Mon, 11 Jul 2011 10:31:54 +0000 (12:31 +0200)]
[g3dvl] softpipe is no longer needed for dri-nouveau

13 years agor600g: revert "support textures with scaled number formats"
Christian König [Mon, 11 Jul 2011 09:39:11 +0000 (11:39 +0200)]
r600g: revert "support textures with scaled number formats"

We should add those probably when merged to master.

13 years agopipe-video: merge fixes
Christian König [Mon, 11 Jul 2011 09:28:23 +0000 (11:28 +0200)]
pipe-video: merge fixes

13 years ago[g3dvl] remove some stale nv40 files
Christian König [Mon, 11 Jul 2011 09:08:45 +0000 (11:08 +0200)]
[g3dvl] remove some stale nv40 files

13 years ago[g3dvl] remove pipe_video_context from nouveau
Christian König [Mon, 11 Jul 2011 09:06:05 +0000 (11:06 +0200)]
[g3dvl] remove pipe_video_context from nouveau

13 years agoMerge remote-tracking branch 'origin/master' into pipe-video
Christian König [Mon, 11 Jul 2011 08:48:59 +0000 (10:48 +0200)]
Merge remote-tracking branch 'origin/master' into pipe-video

Conflicts:
src/gallium/drivers/r600/r600_pipe.c
src/gallium/drivers/r600/r600_state_inlines.h

13 years agoRevert "WIP r600g: depth_buffer_float renderbuffer support on evergreen"
Marek Olšák [Mon, 11 Jul 2011 02:17:37 +0000 (04:17 +0200)]
Revert "WIP r600g: depth_buffer_float renderbuffer support on evergreen"

This reverts commit 91a52dae97379d118965567b5c11e393996baeb9.

Pushed accidentally.

13 years agor600g: more valgrind fixes
Marek Olšák [Mon, 11 Jul 2011 02:13:35 +0000 (04:13 +0200)]
r600g: more valgrind fixes

13 years agor600g: zero memory of ioctl parameters
Marek Olšák [Mon, 11 Jul 2011 02:01:06 +0000 (04:01 +0200)]
r600g: zero memory of ioctl parameters

Fixes valgrind warning.

13 years agomesa: implement packing of DEPTH_STENCIL & FLOAT_32_UNSIGNED_INT_24_8_REV combo
Marek Olšák [Sun, 10 Jul 2011 23:39:53 +0000 (01:39 +0200)]
mesa: implement packing of DEPTH_STENCIL & FLOAT_32_UNSIGNED_INT_24_8_REV combo

Tested with the new piglit fbo-depthstencil test.

13 years agoWIP r600g: depth_buffer_float renderbuffer support on evergreen
Marek Olšák [Tue, 21 Jun 2011 21:22:37 +0000 (23:22 +0200)]
WIP r600g: depth_buffer_float renderbuffer support on evergreen

13 years agoswrast: fix depth/stencil blits when there's no colorbuffer
Marek Olšák [Sun, 10 Jul 2011 18:03:05 +0000 (20:03 +0200)]
swrast: fix depth/stencil blits when there's no colorbuffer

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

13 years agomesa: return early if mask is cleared to zero in BlitFramebuffer
Marek Olšák [Sun, 10 Jul 2011 18:01:33 +0000 (20:01 +0200)]
mesa: return early if mask is cleared to zero in BlitFramebuffer

From ARB_framebuffer_object:
    If a buffer is specified in <mask> and does not exist in both the
    read and draw framebuffers, the corresponding bit is silently
    ignored.

13 years agodocs: update GL3 status
Marek Olšák [Wed, 29 Jun 2011 00:10:55 +0000 (02:10 +0200)]
docs: update GL3 status

13 years agor600g: depth_buffer_float support on r600-r700
Marek Olšák [Mon, 20 Jun 2011 17:40:41 +0000 (19:40 +0200)]
r600g: depth_buffer_float support on r600-r700