Marek Olšák [Tue, 14 Feb 2012 14:24:25 +0000 (15:24 +0100)]
r600g: consolidate set_blend_color code
Marek Olšák [Tue, 14 Feb 2012 14:19:27 +0000 (15:19 +0100)]
r600g: consolidate more translate functions
Marek Olšák [Tue, 14 Feb 2012 14:14:58 +0000 (15:14 +0100)]
r600g: inline r600_translate_ds_func
Marek Olšák [Tue, 14 Feb 2012 14:13:16 +0000 (15:13 +0100)]
r600g: remove unused variable
Marek Olšák [Tue, 14 Feb 2012 14:12:49 +0000 (15:12 +0100)]
r600g: consolidate some translate functions
Marek Olšák [Tue, 14 Feb 2012 14:48:37 +0000 (15:48 +0100)]
Revert "r600g: don't advertise integer textures without GLSL 1.3"
This reverts commit
2c06bcb90982280e82a044b8be83be8fdf5a9590.
It breaks u_blitter trying to blit compressed textures as uint.
Marek Olšák [Tue, 14 Feb 2012 14:04:51 +0000 (15:04 +0100)]
r600g: don't advertise integer textures without GLSL 1.3
Anuj Phogat [Sat, 11 Feb 2012 00:27:19 +0000 (16:27 -0800)]
meta: Add pixel store/pack operations in decompress_texture_image
This patch adds the pixel store operations in decompress_texture_image().
decompress_texture_image() is used in glGetTexImage() for compressed
textures with unsigned, normalized values.
It also fixes the failures in intel oglconform pxstore-gettex due to
following sub test cases:
- Test all mipmaps with byte swapping enabled
- Test all small mipmaps with all allowable alignment values
- Test subimage packing for all mipmap levels
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=40864
Note: This is a candidate for stable branches
Signed-off-by: Anuj Phogat <anuj.phogat@gmail.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Brian Paul [Mon, 13 Feb 2012 14:20:27 +0000 (07:20 -0700)]
mesa: add missing GL_UNSIGNED_INT_10F_11F_11F_REV case
in _mesa_error_check_format_and_type().
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=45967
Stéphane Marchesin [Fri, 10 Feb 2012 03:50:59 +0000 (19:50 -0800)]
gallivm: Replace architecture test with PIPE_ARCH_*
X86Target is a variable, and therefore isn't defined at compile time. So
LLVM_NATIVE_ARCH == X86Target
is translated into
0 == 0
and since X86 is first, we always pick it.
Therefore we replace the logic with PIPE_ARCH_*.
https://bugs.freedesktop.org/show_bug.cgi?id=45420
Stéphane Marchesin [Fri, 10 Feb 2012 04:39:00 +0000 (20:39 -0800)]
i915g: Remove useless draw calls.
Stéphane Marchesin [Thu, 9 Feb 2012 06:43:14 +0000 (22:43 -0800)]
i915g: Add a way to profile the contents of command buffers.
Stéphane Marchesin [Tue, 7 Feb 2012 23:09:26 +0000 (15:09 -0800)]
i915g: Fix comments.
Stéphane Marchesin [Tue, 7 Feb 2012 22:33:31 +0000 (14:33 -0800)]
i915g: Don't emit state when it's already bound.
Stéphane Marchesin [Tue, 7 Feb 2012 22:33:12 +0000 (14:33 -0800)]
i915g: Remove unused poly stipple state.
Stéphane Marchesin [Tue, 7 Feb 2012 22:42:30 +0000 (14:42 -0800)]
i915g: Implement stipple with draw.
Stéphane Marchesin [Mon, 23 Jan 2012 07:44:31 +0000 (23:44 -0800)]
i915g: Fix comment.
Stéphane Marchesin [Tue, 7 Feb 2012 03:57:04 +0000 (04:57 +0100)]
i915g: Move ureg defines to the header so we can share them.
Stéphane Marchesin [Sun, 22 Jan 2012 10:22:20 +0000 (02:22 -0800)]
i915g: Separate declarations and program in the fragment program struct.
We need this later to fixup fragment programs properly.
Dave Airlie [Wed, 30 Nov 2011 20:10:19 +0000 (20:10 +0000)]
st/mesa: only resolve if number of samples is > 1
Marek: this fixes a firefox crash and maybe even:
https://bugs.freedesktop.org/show_bug.cgi?id=45943
NOTE: This is a candidate for the 8.0 branch.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Marek Olšák <maraeo@gmail.com>
Brian Paul [Fri, 3 Feb 2012 15:17:24 +0000 (08:17 -0700)]
swrast: fix span color type selection
Fixes a regression from commit
660ed923ded3552e023ef8c3dd9f92e6792f1bd2.
The basic idea is to look at the format of the dest renderbuffer and
choose either GLubyte or GLfloat for colors. The previous code used
_mesa_format_to_type_and_comps() which could return a bunch types other
than ubyte/float.
Determine the datatype at renderbuffer mapping time to avoid frequent
calls to the format query functions.
NOTE: This is a candidate for the 8.0 branch.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=45578
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=45577
Dave Airlie [Sun, 12 Feb 2012 16:07:19 +0000 (16:07 +0000)]
extensions: remove unused code.
Comparing an unsigned to < 0 is pointless.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Dave Airlie [Sun, 12 Feb 2012 16:05:08 +0000 (16:05 +0000)]
mesa/texparam: drop double semicolons
no idea where these came from, drop them.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Marek Olšák [Sun, 12 Feb 2012 12:06:15 +0000 (13:06 +0100)]
r300g: always fail to create a multisample resource
Just to be safe.
Marek Olšák [Sun, 12 Feb 2012 11:29:12 +0000 (12:29 +0100)]
r300g: assert-fail when calling resource_resolve
And reset the dest pointer to NULL after it.
Alex Deucher [Fri, 10 Feb 2012 23:21:23 +0000 (18:21 -0500)]
gallium/xvmc: r300 and r600 now depend on libdrm_radeon
Fixes:
https://bugs.freedesktop.org/show_bug.cgi?id=45907
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Vinson Lee [Thu, 9 Feb 2012 05:45:27 +0000 (21:45 -0800)]
gallivm: Change getExtent and readByte to non-const with llvm-3.1.
Fix build with llvm-3.1svn.
llvm-3.1svn r149918 changed BufferMemoryObject::getExtent and
BufferMemoryObject::readByte from const member functions to non-const
member functions in include/llvm/Support/MemoryObject.h.
Signed-off-by: Vinson Lee <vlee@freedesktop.org>
Reviewed-by: José Fonseca <jfonseca@vmware.com>
Kenneth Graunke [Thu, 9 Feb 2012 01:14:15 +0000 (17:14 -0800)]
i965: Fix border color on Ironlake.
Ironlake appears to check our pointer against the General State Base
Address upper bound, rather than ignoring the zero bound as it ought.
Unfortunately, since we leave GSBA set to zero, there is no logical
upper bound. Set it to the maximum possible value, which should work
since our virtual addresses only go up to 2GB.
+94 piglits.
NOTE: This is a candidate for stable release branches.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=28924
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
Eric Anholt [Mon, 6 Feb 2012 23:59:11 +0000 (00:59 +0100)]
i965/fs: Add support for generating MADs.
Improves nexuiz performance 0.65% +/- .10% (n=5) on my gen6, and .39%
+/- .11% (n=10) on gen7. No statistically significant performance
difference on warsow (n=5, but only one shader has MADs).
v2: Add support for MADs in 16-wide by using compression control.
v3: Don't generate MADs when it will force an immediate to be moved to a temp.
(it's not clear whether this is a win or not, but it should result in less
questionable change to codegen compared to v2).
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> (v2)
Eric Anholt [Tue, 7 Feb 2012 00:09:59 +0000 (01:09 +0100)]
i965/fs: Add missing register allocation for 3rd sources.
Our only instruction with a 3rd source so far was linterp, and that
value was never register-allocated.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Eric Anholt [Mon, 22 Mar 2010 17:05:42 +0000 (10:05 -0700)]
i965: Add support for the MAD opcode on gen6+.
v2: Fix MRF handling on gen7.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> (v1)
Ian Romanick [Fri, 10 Feb 2012 23:34:08 +0000 (15:34 -0800)]
Bump version to 8.1 (devel)
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Alex Deucher [Fri, 10 Feb 2012 16:30:02 +0000 (11:30 -0500)]
radeon: build fix after
9d9111108eadd65708899284b1cfa9ca425f3ac8
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Alex Deucher [Fri, 10 Feb 2012 16:02:03 +0000 (11:02 -0500)]
r600g: 128 bit formats require tile_type = 1 on cayman
Noticed by taiu on IRC.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Note: this is a candidate for the stable branches.
Alex Deucher [Fri, 10 Feb 2012 15:49:13 +0000 (10:49 -0500)]
r600g: fix tex tile_type offset for cayman
Noticed by taiu on IRC.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Note: this is a candidate for the stable branches.
Brian Paul [Wed, 8 Feb 2012 17:06:21 +0000 (10:06 -0700)]
st/wgl: refactor stw_pixelformat_init()
Replace duplicated code with add_color_format_variants() helper.
José Fonseca [Wed, 8 Feb 2012 16:23:06 +0000 (16:23 +0000)]
st/wgl: Properly support non-displayble pixel formats, and implement float pixelformats as as one.
WGL_ARB_pixel_format establishes the existence of pixel formats which
are invisible to GDI.
However we still need to pass a valid pixelformat to GDI, so that
context creation/binding works.
The actual WGL_TYPE_RGBA_FLOAT_ARB implementation is from Brian Paul.
José Fonseca [Wed, 8 Feb 2012 16:01:22 +0000 (16:01 +0000)]
st/wgl: Invoke SetPixelFormat twice for pbuffers.
José Fonseca [Wed, 8 Feb 2012 15:58:37 +0000 (15:58 +0000)]
st/wgl: Just pass pPixelFormat to stw_pixelformat_get_info().
Avoids the likely error of forgetting to subtract one.
José Fonseca [Wed, 8 Feb 2012 15:46:28 +0000 (15:46 +0000)]
st/wgl: Fix argument of stw_pixelformat_get_info().
stw_pixelformat_get_info takes zero based index, not a 1 based pixel
format number.
Brian Paul [Fri, 10 Feb 2012 15:26:31 +0000 (08:26 -0700)]
mesa: remove unused gl_shared_state::DriverData field
Brian Paul [Fri, 10 Feb 2012 01:06:47 +0000 (18:06 -0700)]
docs: remove link to the GLSL compiler page
The page is terribly out of date.
(cherry picked from commit
65526d54aa2599b069bd443d3e6e9762e613042d)
Brian Paul [Fri, 10 Feb 2012 01:06:06 +0000 (18:06 -0700)]
docs: add VMware link
(cherry picked from commit
6aa9ce2687637ee678fa4258eb9efa695fca8690)
Brian Paul [Fri, 10 Feb 2012 01:05:52 +0000 (18:05 -0700)]
docs: update info about supported systems, GPUs, APIs
Add link to Intel's Linux graphics page, etc.
(cherry picked from commit
14cf3dd826938f0a8a6f32a81c634ecc835f7319)
Brian Paul [Thu, 9 Feb 2012 22:52:13 +0000 (15:52 -0700)]
docs: add news item for 8.0 release
(cherry picked from commit
7aef839760d5216ec2a413092cae35fd223678a4)
Ian Romanick [Thu, 9 Feb 2012 22:28:58 +0000 (14:28 -0800)]
docs: Add 8.0 MD5 checksums
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
(cherry picked from commit
fb56b0972dad8921bc43e1eeb4eebf5e3550e213)
Brian Paul [Thu, 9 Feb 2012 16:20:08 +0000 (09:20 -0700)]
mesa: fix proxy texture target initialization
The mapping from TEXTURE_x_INDEX to GL_TEXTURE_x was broken in
alloc_proxy_textures() because the elements in the targets[] array
were in the wrong order.
This didn't actually cause any failures since we never really use the
proxy texture's Target field. But let's get it right.
NOTE: This is a candidate for the 8.0 branch.
Brian Paul [Fri, 10 Feb 2012 05:15:45 +0000 (22:15 -0700)]
mesa: remove unused gl_pixelmap::Map8[] array
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
Brian Paul [Fri, 10 Feb 2012 05:15:45 +0000 (22:15 -0700)]
st/mesa: stop using Map8[] tables in load_color_map_texture()
Use the float tables instead. Pixel maps are seldom used so this
shouldn't be a big deal. Next, we can get rid of the gl_pixelmap::Map8
array.
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
Brian Paul [Fri, 10 Feb 2012 05:15:45 +0000 (22:15 -0700)]
mesa: remove unused _mesa_map_ci8_to_rgba8()
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
Brian Paul [Thu, 9 Feb 2012 03:10:15 +0000 (20:10 -0700)]
mesa: fix error handling in get_tex_rgba_compressed()
Brian Paul [Thu, 9 Feb 2012 03:10:15 +0000 (20:10 -0700)]
mesa: use _mesa_format_matches_format_and_type() in get_tex_memcpy()
Brian Paul [Thu, 9 Feb 2012 03:10:15 +0000 (20:10 -0700)]
mesa: push row stride adjustment down into _mesa_decompress_image()
There's a mismatch in row strides for compressed textures between
what Driver.MapTextureImage() returns and what the software fetch-texel
functions use. Move it down a layer. The next step would be to fix
this in the fetch-texel functions.
Brian Paul [Thu, 9 Feb 2012 03:11:58 +0000 (20:11 -0700)]
mesa: replace GET_SHINE_TAB_ENTRY() macro with an inline function
Brian Paul [Thu, 9 Feb 2012 03:11:58 +0000 (20:11 -0700)]
mesa: make _mesa_invalidate_shine_table() static
Brian Paul [Thu, 9 Feb 2012 03:11:58 +0000 (20:11 -0700)]
mesa: remove gl_light::_SpotExpTable field
Just use pow() instead. Spot lights aren't too common and fixed-function
lighting isn't as important as it used to me.
This saves 32KB per context. Each table was 4KB and there's 8 lights.
Brian Paul [Thu, 9 Feb 2012 03:11:58 +0000 (20:11 -0700)]
meta: replace abort() with _mesa_problem()
Reviewed-by: José Fonseca <jfonseca@vmware.com>
Brian Paul [Wed, 8 Feb 2012 23:37:26 +0000 (16:37 -0700)]
mesa: fix comment typo
Christian König [Wed, 8 Feb 2012 18:23:33 +0000 (19:23 +0100)]
st/vdpau: use matrix filter to blur/sharpen video
Signed-off-by: Christian König <deathsimple@vodafone.de>
Christian König [Wed, 8 Feb 2012 17:02:11 +0000 (18:02 +0100)]
vl: add a matrix/convolution filter
Can be used for gaussian, mean, laplacian, emboss, sharpness...
Signed-off-by: Christian König <deathsimple@vodafone.de>
Christian König [Tue, 7 Feb 2012 17:03:46 +0000 (18:03 +0100)]
st/vdpau: use median filter for noise reduction
And while at it implement the rest of the feature
querying also.
Signed-off-by: Christian König <deathsimple@vodafone.de>
Christian König [Tue, 7 Feb 2012 17:00:41 +0000 (18:00 +0100)]
vl: add a median filter for noise reduction
This is a shader based median filter, generally
used for noise reduction, it could still need some
improvements, but should usually work out of the box.
Signed-off-by: Christian König <deathsimple@vodafone.de>
Eric Anholt [Wed, 8 Feb 2012 23:12:56 +0000 (15:12 -0800)]
i965/gen7: Fix the length of the MULTISAMPLE state packet in the HiZ op.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Chad Versace <chad.versace@linux.intel.com>
Eric Anholt [Wed, 8 Feb 2012 23:10:12 +0000 (15:10 -0800)]
i965/gen7: Fix the length of the DS state packet in the HiZ op.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Chad Versace <chad.versace@linux.intel.com>
Eric Anholt [Thu, 9 Feb 2012 18:08:00 +0000 (10:08 -0800)]
i965/gen7: Fix GPU hangs from the HiZ op.
The wm max threads is in the same dword as the dispatch enable. The
hardware gets super angry if you set max threads to 0, even if you
aren't dispatching threads.
Mathias Fröhlich [Wed, 25 Jan 2012 16:35:01 +0000 (17:35 +0100)]
glsl: Avoid excessive loop unrolling.
Avoid unrollong loops that are either nested loops or
where the loop body times the unroll count is huge.
The change is far from being perfect but it extends the
loop unrolling decision heuristic by some additional
safeguard. In particular this cuts down compilation of
a shader precomputing atmospheric scattering integral
tables containing two nesting levels in a loop from
something way beyond some minutes (I never waited for
it to finish) to some fractions of a second.
This fixes piglit tests glsl-fs-unroll-explosion and
glsl-vs-unroll-explosion on r600g.
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Mathias Fröhlich <Mathias.Froehlich@web.de>
Anuj Phogat [Thu, 26 Jan 2012 03:05:45 +0000 (19:05 -0800)]
mesa: fix maximum allowed proxy texture size condition
width, height parameter in glTexImage2D() includes: texture image
width + 2 * border (if any). So when doing the texture size check
in _mesa_test_proxy_teximage() width and height should not exceed
maximum supported size for target texture type + 2 * border.
i.e. 1 << (ctx->Const.MaxTextureLevels - 1) + 2 * border
Texture border is anyway stripped out before it is given to intel
or gallium drivers.
This patch fixes Intel oglconform test case:
max_values negative.textureSize.textureCube
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=44970
Note: This is a candidate for mesa 8.0 branch.
Signed-off-by: Anuj Phogat <anuj.phogat@gmail.com>
Reviewed-by: Ian Romanick <idr@freedesktop.org>
Reviewed-by: Brian Paul <brianp@vmware.com>
Dave Airlie [Wed, 8 Feb 2012 13:58:14 +0000 (13:58 +0000)]
st/mesa: exit the update fragment samplers/textures loops early.
If we have no more enabled samplers and we've reset all the previously
used ones, no need to keep going around this loop.
(just moved some stuff around to clean it up a bit).
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Dave Airlie [Wed, 8 Feb 2012 12:47:05 +0000 (12:47 +0000)]
st/mesa: fixup NDEBUG vs DEBUG causing debug path to get taken.
From what I can see we were taking the debug path all the time,
when we probably only want it for enable debug path.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Chia-I Wu [Mon, 6 Feb 2012 09:47:48 +0000 (17:47 +0800)]
mesa: enable remap table when --enable-shared-glapi
As libGL will use libglapi for function lookups, we need to enable the remap
table.
Tested-by: Brian Paul <brianp@vmware.com>
Tested-by: Matt Turner <mattst88@gmail.com>
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=45660
Brian Paul [Tue, 7 Feb 2012 20:08:53 +0000 (13:08 -0700)]
vbo: unmap vertex store before executing lists
We don't want our VBOs mapped when we're drawing. This change checks
if the vertex store VBO is mapped before we execute a list, unmaps it,
then remaps it after drawing. This situation pops up when building a
nested display list in GL_COMPILE_AND_EXECUTE mode.
Reviewed-by: Eric Anholt <eric@anholt.net>
Christoph Bumiller [Mon, 6 Feb 2012 15:29:03 +0000 (16:29 +0100)]
gallium: add PIPE_CAP_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION
Just let the hardware do it if it can and avoid drivers having to
check for the special case on each draw call.
v2: update the draw module
Carl Worth [Sat, 4 Feb 2012 00:25:38 +0000 (16:25 -0800)]
dri: Emit a critical error if the swrast driver fails to load.
Something has gone wrong if swrast is requested but cannot be
loaded. The user really should be made aware of this, (and instructed
to set LIBGL_DEBUG for more details).
The wording of this error message is updated from "reverting to
indirect rendering" to the more objectively descriptive "failed to
load driver: swrast". The former wording makes assumptions about what
the calling code will decide to do next, rather than simply describing
what went wrong within the current function. The new wording is
consistent with the critical errors recently added for hardware
drivers that fail to load.
Reviewed-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
Carl Worth [Sat, 4 Feb 2012 00:25:38 +0000 (16:25 -0800)]
dri: Emit a critical error if a named driver fails to load.
Something has gone wrong if we were asked to load a driver of a
specific name, but it failed to load for some reason. The user really
should be made aware of this, (and instructed to set LIBGL_DEBUG for
more details).
Reviewed-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
Carl Worth [Sat, 4 Feb 2012 00:17:29 +0000 (16:17 -0800)]
dri: Add a CriticalErrorMessageF macro.
Sometimes an error is so sever that we want to print it even when the
user hasn't specifically requested debugging by setting LIBGL_DEBUG.
Add a CriticalErrorMessageF macro to be used for this case. (The error
message can still be slienced with the existing LIBGL_DEBUG=quiet).
For critical error messages we also direct the user to set the
LIBGL_DEBUG environment variable for more details.
Reviewed-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
Carl Worth [Sat, 4 Feb 2012 00:14:23 +0000 (16:14 -0800)]
dri: Clarify comments on InfoMessageF and ErrorMessageF macros.
The description of ErrorMessageF was misleading in the case of
LIBGL_DEBUG being unset, (the previous comment could be understood to
mean the error should be printed, but the code does not print in this
case).
InfoMessageF previously had no comment at all.
Reviewed-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
Chad Versace [Wed, 8 Feb 2012 23:07:33 +0000 (15:07 -0800)]
glsl: Fix Android build
The build was broken by the line below, added in commit
4f82fed4.
s_expression.cpp:26: #include <limits>
Mesa's half of the fix is to add 'external/astl/include' to the include
path. The other half of the fix requires implementing
numeric_limits<float>::infinity() in astl, for which I have patches
submitted upstream for review.
Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
Christian König [Mon, 6 Feb 2012 19:56:10 +0000 (20:56 +0100)]
r600g: fix handling of outputs as TEX addr sources
Outputs should be treated in the same way as
inputs and temporaries here.
Signed-off-by: Christian König <deathsimple@vodafone.de>
Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
Chad Versace [Wed, 8 Feb 2012 17:18:46 +0000 (09:18 -0800)]
i965: Remove file i965/junk, accidentally added in
7b36c68
Dave Airlie [Tue, 7 Feb 2012 16:18:05 +0000 (16:18 +0000)]
st/mesa: avoid vertex texture and sampler updates for 0 case
If we had no vertex textures or samplers previously and we have none now,
don't bother doing the enables dance.
I was profiling nexuiz on noop and noticed these two functions in the
profile, this drops their usage from 0.86% to 0.03% and 0.23% to 0.03%
for texture and samplers.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Kenneth Graunke [Wed, 8 Feb 2012 02:14:53 +0000 (18:14 -0800)]
i965: Remove broken symlink to intel_decode.c.
Eric removed intel_decode.c in
61b9ccd9e298ca1d3db55aee0cb2ff78662d6fa6.
Eric Anholt [Sat, 4 Feb 2012 13:05:46 +0000 (14:05 +0100)]
i965/fs: Implement GL_CLAMP behavior on texture rectangles on gen6+.
We were doing saturate-based clamping on the [0,width] or [0,height]
coordinate, which meant only the first pixel was addressable.
Fixes piglit ARB_texture_rectangle/texwrap-RECT-bordercolor
NOTE: This is a candidate for the 8.0 release branch.
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Eric Anholt [Fri, 3 Feb 2012 18:06:08 +0000 (19:06 +0100)]
i965/fs: Move GL_CLAMP handling to coordinate setup.
We should be able to merge self-move instruction into the MRF move
anyway, and this simplifies things for the next commit.
NOTE: This is a candidate for the 8.0 release branch.
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Eric Anholt [Wed, 8 Feb 2012 00:03:17 +0000 (16:03 -0800)]
i965: Fix HiZ change compiler warning.
Chad Versace [Thu, 26 Jan 2012 19:01:36 +0000 (11:01 -0800)]
i965: Rewrite the HiZ op
The HiZ op was implemented as a meta-op. This patch reimplements it by
emitting a special HiZ batch. This fixes several known bugs, and likely
a lot of undiscovered ones too.
==== Why the HiZ meta-op needed to die ====
The HiZ op was implemented as a meta-op, which caused lots of trouble. All
other meta-ops occur as a result of some GL call (for example, glClear and
glGenerateMipmap), but the HiZ meta-op was special. It was called in
places that Mesa (in particular, the vbo and swrast modules) did not
expect---and were not prepared for---state changes to occur (for example:
glDraw; glCallList; within glBegin/End blocks; and within
swrast_prepare_render as a result of intel_miptree_map).
In an attempt to work around these unexpected state changes, I added two
hooks in i965:
- A hook for glDraw, located in brw_predraw_resolve_buffers (which is
called in the glDraw path). This hook detected if a predraw resolve
meta-op had occurred, and would hackishly repropagate some GL state
if necessary. This ensured that the meta-op state changes would not
intefere with the vbo module's subsequent execution of glDraw.
- A hook for glBegin, implemented by brwPrepareExecBegin. This hook
resolved all buffers before entering
a glBegin/End block, thus preventing an infinitely recurring call to
vbo_exec_FlushVertices. The vbo module calls vbo_exec_FlushVertices to
flush its vertex queue in response to GL state changes.
Unfortunately, these hooks were not sufficient. The meta-op state changes
still interacted badly with glPopAttrib (as discovered in bug 44927) and
with swrast rendering (as discovered by debugging gen6's swrast fallback
for glBitmap). I expect there are more undiscovered bugs. Rather than play
whack-a-mole in a minefield, the sane approach is to replace the HiZ
meta-op with something safer.
==== How it was killed ====
This patch consists of several logical components:
1. Rewrite the HiZ op by replacing function gen6_resolve_slice with
gen6_hiz_exec and gen7_hiz_exec. The new functions do not call
a meta-op, but instead manually construct and emit a batch to "draw"
the HiZ op's rectangle primitive. The new functions alter no GL
state.
2. Add fields to brw_context::hiz for the new HiZ op.
3. Emit a workaround flush when toggling 3DSTATE_VS.VsFunctionEnable.
4. Kill all dead HiZ code:
- the function gen6_resolve_slice
- the dirty flag BRW_NEW_HIZ
- the dead fields in brw_context::hiz
- the state packet manipulation triggered by the now removed
brw_context::hiz::op
- the meta-op workaround in brw_predraw_resolve_buffers (discussed
above)
- the meta-op workaround brwPrepareExecBegin (discussed above)
Note: This is a candidate for the 8.0 branch.
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Acked-by: Paul Berry <stereotype441@gmail.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=43327
Reported-by: xunx.fang@intel.com
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=44927
Reported-by: chao.a.chen@intel.com
Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
Ian Romanick [Thu, 2 Feb 2012 23:32:45 +0000 (16:32 -0700)]
intel: Avoid divide by zero for very small linear blits
If size is small (such as 1),
pitch = ROUND_DOWN_TO(MIN2(size, (1 << 15) - 1), 4);
makes pitch = 0. Then
height = size / pitch;
causes a division-by-zero exception. If pitch is zero, set height to
1 and avoid the division.
This fixes piglit's bin/getteximage-formats test and glean's
bufferObject test.
NOTE: This is a candidate for the 8.0 release branch.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=44971
Ian Romanick [Wed, 1 Feb 2012 18:37:54 +0000 (11:37 -0700)]
intel: Remove num_mapped_regions assertion from _intel_batchbuffer_flush
There are cases where a buffer can be mapped while another buffer is
flushed. This can happen in the CopyPixels meta-op path for piglit's
fbo-mipmap-copypix. After some discussion with Eric, it seems this
assertion is no longer necessary, and it has always been too strict.
NOTE: This is a candidate for the 8.0 branch.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=43328
Cc: Eric Anholt <eric@anholt.net>
Reviewed-by: Chad Versace <chad.versace@linux.intel.com>
Tobias Droste [Tue, 7 Feb 2012 15:27:11 +0000 (16:27 +0100)]
gallium/gbm: r300 and r600 now depend on libdrm
fixes undefined references in libradeonwinsys.a when linking
Signed-off-by: Tobias Droste <tdroste@gmx.de>
Brian Paul [Tue, 7 Feb 2012 14:48:46 +0000 (07:48 -0700)]
r600g: remove unused vars to silence warnings
Brian Paul [Tue, 7 Feb 2012 14:42:33 +0000 (07:42 -0700)]
mesa: remove unused _mesa_error_check_format_type() function
This was only used by glReadPixels and glDrawPixels. Now those
functions do the corresponding error checks.
Signed-off-by: Brian Paul <brianp@vmware.com>
Brian Paul [Tue, 7 Feb 2012 14:42:33 +0000 (07:42 -0700)]
mesa: stop using _mesa_error_check_format_type() in glReadPixels
Basically the same story as the previous commit. But we were
already calling _mesa_source_buffer_exists() in ReadPixels().
Yeah, we were calling it twice.
Signed-off-by: Brian Paul <brianp@vmware.com>
Brian Paul [Tue, 7 Feb 2012 14:42:33 +0000 (07:42 -0700)]
mesa: stop using _mesa_error_check_format_type() in glDrawPixels
The _mesa_error_check_format_type() function does two things: check
that format/type is legal and check that the destination (or source
buffer for glReadPixels) actually exists. Just move the relevant
parts of that into _mesa_DrawPixels().
We'll do a similar change in glReadPixels then get rid of the function
altogether.
Signed-off-by: Brian Paul <brianp@vmware.com>
Brian Paul [Tue, 7 Feb 2012 14:42:33 +0000 (07:42 -0700)]
mesa: remove redundant format/type checks in glReadPixels()
These are done in _mesa_error_check_format_and_type().
Signed-off-by: Brian Paul <brianp@vmware.com>
Brian Paul [Tue, 7 Feb 2012 14:42:33 +0000 (07:42 -0700)]
mesa: remove redundant format/type checks in glGetTexImage()
The _mesa_error_check_format_and_type() function will catch all those
cases now.
Signed-off-by: Brian Paul <brianp@vmware.com>
Brian Paul [Tue, 7 Feb 2012 14:42:33 +0000 (07:42 -0700)]
mesa: new _mesa_error_check_format_and_type() function
This replaces the _mesa_is_legal_format_and_type() function.
According to the spec, some invalid format/type combinations to
glDrawPixels, ReadPixels and glTexImage should generate
GL_INVALID_ENUM but others should generate GL_INVALID_OPERATION.
With the old function we didn't make that distinction and generated
GL_INVALID_ENUM errors instead of GL_INVALID_OPERATION. The new
function returns one of those errors or GL_NO_ERROR.
This will also let us remove some redundant format/type checks in
follow-on commit.
v2: add more checks for ARB_texture_rgb10_a2ui at the top of
_mesa_error_check_format_and_type() per Ian.
Signed-off-by: Brian Paul <brianp@vmware.com>
Dave Airlie [Tue, 7 Feb 2012 14:26:16 +0000 (14:26 +0000)]
scons: fix typo in package version
pointed out on irc by GArik_
Signed-off-by: Dave Airlie <airlied@redhat.com>
Dave Airlie [Tue, 7 Feb 2012 14:19:28 +0000 (14:19 +0000)]
radeon: only init surface manage on r600
r300 fails to init the manager and then fails to init.
Signed-off-by: Dave Airlie <airlied@redhat.com>
José Fonseca [Tue, 7 Feb 2012 11:17:35 +0000 (11:17 +0000)]
scons: Require same pkg-config versions as configure.
José Fonseca [Tue, 7 Feb 2012 11:16:35 +0000 (11:16 +0000)]
scons: r300/r600 now depends on libdrm.
As they now indirectly include on libdrm/radeon_surface.h.
Brian Paul [Tue, 7 Feb 2012 00:56:43 +0000 (17:56 -0700)]
mesa: support more format/type combos in _mesa_dump_image()