Commit graph

45370 commits

Author SHA1 Message Date
Brian Paul
db0f2b3637 mesa: use inline function wrapper for _mesa_reference_texobj() 2011-07-14 08:14:13 -06:00
Brian Paul
74142f1bf2 mesa: use inline function wrapper for _mesa_reference_renderbuffer() 2011-07-14 08:14:13 -06:00
Brian Paul
5db7723ada mesa: use inline function wrapper for _mesa_reference_framebuffer() 2011-07-14 08:14:08 -06:00
Brian Paul
6214963c00 main: use inline function wrapper for _mesa_reference_buffer_object() 2011-07-14 08:09:38 -06:00
Dave Airlie
323e4bff79 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>
2011-07-14 08:09:38 -06:00
Christian König
8619aa5683 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.
2011-07-14 15:36:34 +02:00
Christian König
33bf410ace g3dvl: check for existense of VDPAU header/libs
Building the VDPAU state tracker only works when the header/libs are available.
2011-07-14 15:36:24 +02:00
Christian König
a8ae8cf3f1 g3dvl: check for existense of XvMC header/libs
Building the XvMC state tracker only works when the header/libs are available.
2011-07-14 15:36:14 +02:00
Christoph Bumiller
7e2827fad9 nv50,nvc0: extensive surface format renaming to get consistency
Now the component ordering is consistent and matches gallium again.
2011-07-14 12:51:06 +02:00
Christoph Bumiller
b2dcf880e8 nv50,nvc0: add support for multi-sample resources 2011-07-14 12:51:06 +02:00
Christoph Bumiller
c011f94b7b nv50,nvc0: add correct storage type for Z32_FLOAT 2011-07-14 12:51:06 +02:00
Christoph Bumiller
cad17554c4 nv50,nvc0: unify nvc0_miptree and nv50_miptree structs
Share some functions and restructure miptree creation a little.
Prepare for multi-sample resources.
2011-07-14 12:51:06 +02:00
Christoph Bumiller
ebeec1d43a 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.
2011-07-14 12:51:06 +02:00
Vinson Lee
3cf22a0c6e g3dvl: Remove non-constant expression array initializers.
The array initializer must be a constant expression in MSVC.
2011-07-13 21:57:50 -07:00
Marek Olšák
02c8ee202f 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.
2011-07-14 03:03:26 +02:00
Marek Olšák
67aba799bc gallium/targets: do not link every driver with libllvmpipe.a
Only some targets need that, the others don't.
2011-07-14 03:03:26 +02:00
Marek Olšák
5fe54df58f Rename swrastg_dri to swrast_dri
I prefer it this way and it has been suggested earlier by others too.
Opinions?
2011-07-14 03:03:26 +02:00
Brian Paul
b82db9a3c0 softpipe: fix various warnings about int/float/double conversions, etc 2011-07-13 18:54:31 -06:00
Vinson Lee
f292d07b47 g3dvl: Remove designated initializers.
MSVC does not support designated initializers.
2011-07-13 17:00:26 -07:00
Vinson Lee
49967950a5 g3dvl: s/inline/INLINE/
The inline keyword is not available in MSVC C.
2011-07-13 15:59:08 -07:00
Emil Velikov
88d647d83b utils: Add missing parentheses
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Signed-off-by: Brian Paul <brianp@vmware.com>
2011-07-13 16:37:29 -06:00
Vinson Lee
3e58345794 softpipe: Remove sp_video_context.c from SConscript.
sp_video_context.c was added to SConscript in commit
ed24e19070 (pipe-video merge) but no file
of that name was added.
2011-07-13 14:50:12 -07:00
Christian König
d4cbd1272b [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.
2011-07-13 23:33:20 +02:00
Christian König
ed24e19070 Merge branch 'pipe-video' 2011-07-13 22:56:06 +02:00
Stéphane Marchesin
85e1fa5506 i915g: don't try to check if a NULL buffer is busy. 2011-07-13 11:59:10 -07:00
Stéphane Marchesin
f7a85f603b Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/mesa 2011-07-13 11:56:44 -07:00
Vadim Girlin
4f4855b249 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>
2011-07-13 11:58:29 -06:00
Christian König
a2a6799fbe [g3dvl] remove some unneeded Makefiles 2011-07-13 19:37:28 +02:00
Christian König
211887c92b r600g: reenable hardware blits for STATIC and IMMUTABLE resources
Getting the driver in sync with mainline.
2011-07-13 17:05:58 +02:00
Christian König
a0a22fead5 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.
2011-07-13 16:37:15 +02:00
Christian König
c5110a1bfa [g3dvl] implement workaround for missing blender clamp control
It's about 20% slower, but should at least work with every hardware.
2011-07-13 16:07:30 +02:00
Christian König
c8dd301b6f 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".
2011-07-13 15:54:28 +02:00
Christian König
7c48575402 [g3dvl] keep a pointer in idct buffer to idct object
So we always know to which idct object a buffer belongs
2011-07-13 15:01:40 +02:00
Chia-I Wu
5fe5d236c2 targets/egl-static: fix a linking error
rbug is always linked in and it needs libpthread.
2011-07-13 15:26:34 +08:00
Eric Anholt
556a47a262 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
2011-07-12 16:01:21 -07:00
Daniel Vetter
ed570cb5e5 i915g: fixup context desdruction
Reported-by: Christopher Egert <cme3000@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2011-07-13 00:09:36 +02:00
Eric Anholt
f2fd0d6304 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>
2011-07-12 14:41:04 -07:00
Eric Anholt
898be7d5ac mesa: Fix assertion failure in X8_Z24/Z24_X8 texfetch.
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2011-07-12 14:41:01 -07:00
Eric Anholt
6aae729d6e i915: Fix depth texturing since 86e62b2357
The 965 driver already had the X8_Z24 case, but 915 was missing it.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2011-07-12 14:40:52 -07:00
Eric Anholt
9a82d89a8f 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>
2011-07-12 14:40:43 -07:00
Eric Anholt
6e6b388604 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>
2011-07-12 14:40:39 -07:00
Eric Anholt
aceb66951d intel: Use _mesa_tex_target_to_face() helper function instead of our own.
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2011-07-12 14:40:31 -07:00
Alex Deucher
5d0d8366f9 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>
2011-07-12 12:01:25 -04:00
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