Christian König [Mon, 23 Jan 2012 20:28:34 +0000 (21:28 +0100)]
vl: add a simple weave deinterlacer
Well it's not so simple, since it does
deinterlacing and scaling at the same time.
Signed-off-by: Christian König <deathsimple@vodafone.de>
Christian König [Thu, 26 Jan 2012 14:30:53 +0000 (15:30 +0100)]
vl/video_buffer: fix interlaced surface ordering
Signed-off-by: Christian König <deathsimple@vodafone.de>
Christian König [Mon, 30 Jan 2012 16:51:53 +0000 (17:51 +0100)]
vl/video_buffer: fix height of interlaced video buffers
Signed-off-by: Christian König <deathsimple@vodafone.de>
Roland Scheidegger [Mon, 6 Feb 2012 00:04:28 +0000 (01:04 +0100)]
mesa: check_index_bounds off-by-one fix
in check_index_bounds the comparison needs to be "greater equal" since
contrary to the name _MaxElement is the count of the array (this matches
similar code in vbo_exec_DrawRangeElementsBaseVertex).
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Eric Anholt [Fri, 3 Feb 2012 04:28:14 +0000 (05:28 +0100)]
mesa: Fix xcb-dri2 link flags leaking into LIBS.
Fixes the build of builtin_compiler on my 32-bit build where xcb-dri2
is in a custom prefix but the custom prefix flags weren't available.
It shouldn't have been in LIBS anyway.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Eugeni Dodonov [Wed, 1 Feb 2012 20:24:23 +0000 (18:24 -0200)]
intel: check for LLC support when reading maps
This checks for advertised LLC support by the GPU instead of relying on
the GPU generation for detection.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Signed-off-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
Eugeni Dodonov [Wed, 1 Feb 2012 20:06:53 +0000 (18:06 -0200)]
intel: verify if hardware has LLC support
Rely on libdrm HAS_LLC parameter to verify if hardware supports it. In
case the libdrm version does not supports this check, fallback to older
way of detecting it which assumed that GPUs newer than GEN6 have it.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Signed-off-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
Dave Airlie [Sat, 28 Jan 2012 18:29:18 +0000 (18:29 +0000)]
draw: fix fog coord export.
This does what we do in the hw drivers, and only export the X.
fixes the fogcoord.dp* tests.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Chih-Wei Huang [Thu, 2 Feb 2012 12:23:57 +0000 (20:23 +0800)]
vbo: fix a building error
Signed-off-by: Marek Olšák <maraeo@gmail.com>
NOTE: This is a candidate for the 8.0 branch.
José Fonseca [Wed, 9 Nov 2011 19:29:37 +0000 (19:29 +0000)]
llvmpipe: Make more resilient to out-of-memory situations.
Most of the code was alright, but we were missing a few paths.
Reviewed-by: Brian Paul <brianp@vmware.com>
Keith Whitwell [Wed, 22 Dec 2010 14:04:42 +0000 (14:04 +0000)]
llvmpipe: clear storage for newly allocated resources
Was previously being done in a state-tracker, but in a way which was
difficult for some drivers to optimize. Push down to this level and
make it the individual drivers responsibility.
Ian Romanick [Wed, 1 Feb 2012 17:18:13 +0000 (10:18 -0700)]
intel: FBOs with texture border are unsupported
FBOs differ from textures in a significant way. With textures, we can
strip the border and get correct rendering except when the application
fetches texels outside [0,1].
With an FBO, the pixel at (0,0) is in the border. The
ARB_framebuffer_object spec says:
"If the attached image is a texture image, then the window
coordinates (x[w], y[w]) correspond to the texel (i, j, k), from
figure 3.10 as follows:
i = (x[w] - b)
j = (y[w] - b)
k = (layer - b)
where <b> is the texture image's border width..."
Since the border doesn't exist, we can never render any pixels in the
correct location. Just mark these FBOs FRAMEBUFFER_UNSUPPORTED.
NOTE: This is a candidate for the 8.0 branch.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=42336
Ville Syrjala [Wed, 1 Feb 2012 03:10:04 +0000 (05:10 +0200)]
gallium/dri: Handle xserver that doesn't send needless DRI2 invalidate events
Ever since xserver commit
531869448d07e00ae241120b59f3aaaa5709d59c,
the server no longer sends invalidate events to clients, unless they
have performed a GetBuffers request since the drawable was last
invalidated.
If the drawable gets invalidated immediately after the GetBuffers
request was processed by the X server, it's possible that Xlib
will process the invalidate event while waiting for the GetBuffers
reply. So the server, thinking the client knows that the buffers
are invalid, is waiting for another GetBuffers request before
sending any more invalidate events. The client, on the other hand,
believes the buffers to be valid, and thus is expecting to receive
another invalidate event before it has to send another GetBuffers
request. The end result is that the client never again sends
a GetBuffers request.
To avoid this problem, take a snapshot of the lastStamp before
doing GetBuffers, and retry if the snapshot and the current
lastStamp no longer match after the GetBuffers reply has been
processed.
Signed-off-by: Ville Syrjälä <syrjala@sci.fi>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Eric Anholt [Mon, 30 Jan 2012 17:50:35 +0000 (09:50 -0800)]
glsl: Add error case for switch() with two default cases.
Fixes piglit switch-case-duplicated.vert.
NOTE: This is a candidate for the 8.0 branch.
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Eric Anholt [Mon, 30 Jan 2012 16:50:14 +0000 (08:50 -0800)]
glsl: Throw an error when faced with a duplicated switch() case label.
The error message I chose matches gcc's error. Fixes piglit
switch-case-duplicated.vert.
NOTE: This is a candidate for the 8.0 branch.
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Eric Anholt [Mon, 30 Jan 2012 17:46:09 +0000 (09:46 -0800)]
glsl: Add other missing error location information for switch statements.
NOTE: This is a candidate for the 8.0 branch.
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Eric Anholt [Mon, 30 Jan 2012 17:41:55 +0000 (09:41 -0800)]
glsl: Add missing location info to case labels.
Otherwise, the upcoming error messages said the location was 0:0(0).
NOTE: This is a candidate for the 8.0 branch.
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Eric Anholt [Sat, 28 Jan 2012 19:43:22 +0000 (11:43 -0800)]
glsl: Throw the required error when a case label is a non-constant.
It's not quite spelled out in the spec text, but the grammar indicates
that only constant values are allowed as switch() case labels (and
only constant values make sense, anyway).
Fixes piglit glsl-1.30/compiler/switch-statement/switch-case-uniform-int.vert.
NOTE: This is a candidate for the 8.0 branch.
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Eric Anholt [Sat, 28 Jan 2012 19:26:02 +0000 (11:26 -0800)]
glsl: Save and restore the whole switch state for nesting.
This stuffs them all in a struct for sanity. Fixes piglit
glsl-1.30/execution/switch/fs-uniform-nested.
NOTE: This is a candidate for the 8.0 branch.
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Eric Anholt [Mon, 30 Jan 2012 21:30:53 +0000 (13:30 -0800)]
dri: Add Unigine Tropics as an app that requires the GLSL warn workaround.
I wasn't seeing it be needed because of the previous bug.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
Eric Anholt [Mon, 30 Jan 2012 21:29:07 +0000 (13:29 -0800)]
dri: Fix typo in xml file that made all applications use the workaround.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
Eric Anholt [Mon, 30 Jan 2012 21:20:27 +0000 (13:20 -0800)]
mesa: Fix the error message function names for glFlushMappedBufferRange().
Reviewed-by: Brian Paul <brianp@vmware.com>
Eric Anholt [Thu, 26 Jan 2012 00:30:26 +0000 (16:30 -0800)]
mesa: Fix bad-enum/no-buffer error handling for buffer object functions.
For all the extension entrypoints using the get_buffer() helper, they
wanted the same error handling. In some cases, the error was doing
the same error return whether target was a bad enum, or a user buffer
wasn't bound.
(Actually, GL_ARB_map_buffer_range doesn't specify the error for a zero
buffer being bound for MapBufferRange, though it does for
FlushMappedBufferRange. This appears to be an oversight).
Fixes piglit GL_ARB_copy_buffer/negative-bound-zero.
Reviewed-by: Brian Paul <brianp@vmware.com>
Brian Paul [Fri, 3 Feb 2012 03:10:40 +0000 (20:10 -0700)]
glsl: move array_sizing_visitor class outside of link_intrastage_shaders()
To silence warnings with gcc 4.4.x on Linux and llvm-g++ 4.2 on Mac.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Brian Paul [Thu, 2 Feb 2012 22:14:04 +0000 (15:14 -0700)]
gallium/postprocess: move declarations before code
To fix MSVC build.
Lauri Kasanen [Tue, 24 Jan 2012 19:37:56 +0000 (21:37 +0200)]
gallium/postprocess: Just to be safe, reference all buffers from outside
Even though it should be safe to use them for one frame, better be sure.
Suggested by Michael Dänzer.
NOTE: This is a candidate for the 8.0 stable branch.
Signed-off-by: Lauri Kasanen <cand@gmx.com>
Lauri Kasanen [Tue, 24 Jan 2012 19:37:07 +0000 (21:37 +0200)]
gallium/postprocess: Fix depth logic
This prevents a possible lapse of the depth buffer - the situation where
the app and pp have different depth buffers.
NOTE: This is a candidate for the 8.0 stable branch.
Signed-off-by: Lauri Kasanen <cand@gmx.com>
Carl Worth [Thu, 2 Feb 2012 19:29:51 +0000 (11:29 -0800)]
glsl: Avoid ralloc_stealing a long-lived object to a short-lived parent
In commit
6ecee54a9aecc120cb68b02f7e14dcac86b9eca2 a call to
talloc_reference was replaced with a call to talloc_steal. This was in
preparation for moving to ralloc which doesn't support reference
counting.
The justification for talloc_steal within token_list_append in that
commit is that the tokens are being copied already. But the copies are
shallow, so this does not work.
Fortunately, the lifetime of these tokens is easy to understand. A
token list for "replacements" is created and stored in a hash table
when a function-like macro is defined. This list will live until the
macro is #undefed (if ever).
Meanwhile, a shallow copy of the list is created when the macro is
used and the list expanded. This copy is short-lived, so is unsuitable
as a new parent.
So we can just let the original, longer-lived owner continue to own
the underlying objects and things will work.
This fixes bug #45082:
"ralloc.c:78: get_header: Assertion `info->canary == 0x5A1106'
failed." when using a macro in GLSL
https://bugs.freedesktop.org/show_bug.cgi?id=45082
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
NOTE: This is a candidate for stable release branches.
Carl Worth [Thu, 2 Feb 2012 19:27:55 +0000 (11:27 -0800)]
glsl: Add glcpp tests for a macro used twice
This test cases exposes a bug as described in this bug report:
"ralloc.c:78: get_header: Assertion `info->canary == 0x5A1106'
failed." when using a macro in GLSL
https://bugs.freedesktop.org/show_bug.cgi?id=45082
Clearly, some memory is getting (incorrectly) freed on the first macro
invocation, leading to problems with the second macro invocation.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Carl Worth [Sat, 21 Jan 2012 17:24:11 +0000 (09:24 -0800)]
glcpp: Fix so that trailing punctuation does not prevent macro expansion
The trick here is that flex always chooses the rule that matches the most
text. So with a input text of "two:" which we want to be lexed as an
IDENTIFIER token "two" followed by an OTHER token ":" the previous OTHER
rule would match longer as a single token of "two:" which we don't want.
We prevent this by forcing the OTHER pattern to never match any
characters that appear in other constructs, (no letters, numbers, #,
_, whitespace, nor any punctuation that appear in CPP operators).
Fixes bug #44764:
GLSL preprocessor doesn't replace defines ending with ":"
https://bugs.freedesktop.org/show_bug.cgi?id=44764
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
NOTE: This is a candidate for stable release branches.
Carl Worth [Sat, 21 Jan 2012 17:22:24 +0000 (09:22 -0800)]
glcpp: Add new test showing bug where a trailing ':' prevents macro expansion
This demonstrates a bug that was recently triggered in piglit.
Here is the original bug report (containing a test case almost identical
to this one):
https://bugs.freedesktop.org/show_bug.cgi?id=44764
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Ian Romanick [Thu, 2 Feb 2012 05:46:31 +0000 (22:46 -0700)]
mesa: Fix copy-and-paste error in _mesa_pack_rgba_span_float
GL_RG_INTEGER only has two components, not three. I'll be surprised
if anyone ever tries to glReadPixels(..., GL_SHORT, GL_RG_INTEGER,
...). This was found by inspection.
NOTE: This is a candidate for the 8.0 branch.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Ian Romanick [Wed, 1 Feb 2012 21:19:35 +0000 (14:19 -0700)]
mesa: Fix copy-and-paste bug in do_row_3D
Several of the half-float cases used 4 as the texel size when it
should have been some smaller value.
NOTE: This is a candidate for the 8.0 branch.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=43324
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=43325
Ian Romanick [Tue, 31 Jan 2012 18:29:06 +0000 (11:29 -0700)]
mesa: Convert colors if span ChanType and renderbuffer data type don't match
This is a partial revert of f9874fe. It turns out that the types
don't always match. Specifically, this can happen when doing
glCopyPixels from a float FBO to a RGBA8 FBO.
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=45429
Reviewed-by: Brian Paul <brianp@vmware.com>
Ian Romanick [Tue, 31 Jan 2012 16:00:48 +0000 (09:00 -0700)]
mesa: Set the gl_array_object::ARBsemantics flag at the right time
With 0963990 the flag was only set when Bind created the object. In
all cases where ::ARBsemantics could be true, this path never
happened. Instead, add a _Used flag to track whether a VAO has ever
been bound. On the first Bind, set the _Used flag, and set the
ARBsemantics flag to the correct value.
NOTE: This is a candidate for release branches.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=45423
Ian Romanick [Wed, 18 Jan 2012 19:56:12 +0000 (11:56 -0800)]
mesa: Add unpack_uint_z_row support for floating-point depth buffers
This is a hack, and it will result in incorrect rendering. However,
it does eliminate spurious warnings in several piglit CopyPixels tests
that involve floating-point depth buffers.
The real solution is to add a zf field to SWspan to store float Z
values. When a float depth buffer is involved, swrast should also
populate the zf field. I'll consider this post-8.0 work.
NOTE: This is a candidate for the 8.0 branch.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Brian Paul [Thu, 2 Feb 2012 15:14:35 +0000 (08:14 -0700)]
Revert "Fix underlinking in libOSMesa since commit adefee5 "Always build shared glapi""
This reverts commit
4e5a8937d1a1bfb2a3bd067ed01e036728675fc2.
... to fix build with --enable-osmesa
José Fonseca [Thu, 2 Feb 2012 13:19:56 +0000 (13:19 +0000)]
draw: Avoid NULL pointer dereference when binding NULL fragment shaders.
Now that the draw module avoids flushing, it may flush precisely when
binding a NULL shader, so care must be taken when restoring the original
fragment shader.
Reviewed-by: Brian Paul <brianp@vmware.com>
José Fonseca [Thu, 2 Feb 2012 10:44:10 +0000 (10:44 +0000)]
mapi/glapi: Never use a generic no-op entry-point on Windows.
When GLAPIENTRY is __stdcall (ie Windows), the stack is popped by the
callee making the number/type of arguments significant, therefore
using a generic no-op causes stack corruption for many entry-points.
NOTE: This is a candidate for the 8.0 branch.
Reviewed-by: Brian Paul <brianp@vmware.com>
ojab [Wed, 1 Feb 2012 06:00:10 +0000 (10:00 +0400)]
gallivm: Fix LLVM-2.7 build.
Signed-off-by: José Fonseca <jfonseca@vmware.com>
Tested-by: Vinson Lee <vlee@freedesktop.org>
José Fonseca [Wed, 1 Feb 2012 14:38:28 +0000 (14:38 +0000)]
gallivm: Remove MSVC RT hack.
The hack never worked reliably, and docs/llvmpipe.html is quite clear on
the requirement of matching CRT when building LLVM and Mesa already.
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.
i.e. 1 << (ctx->Const.MaxTextureLevels - 1)
Texture border is anyway stripped out before it is given to intel
or gallium drivers.
This patch fixes Intel oglconform test case: max_values
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: Jose Fonseca <jfonseca@vmware.com>
Zack Rusin [Wed, 1 Feb 2012 04:12:22 +0000 (23:12 -0500)]
svga: fix a crash happening before setting fragment shaders.
In certain situations API's will call pipe->clear which doesn't
require fragment shader, but then we'd try to verify the pipeline
and assume fragment shader was always set. This was leading to
crash when API would just call simple clear's before anything else.
NOTE: This is a candidate for the 8.0 branch.
Reviewed-by: José Fonseca <jfonseca@vmware.com>
Brian Paul [Wed, 1 Feb 2012 21:02:35 +0000 (14:02 -0700)]
st-api: fix typos, whitespace, line wrapping
Brian Paul [Wed, 1 Feb 2012 15:42:48 +0000 (08:42 -0700)]
vbo: fix node_attrsz[] usage in vbo_bind_vertex_list()
The node_attrsz[] array is initially copied from the node->attrsz[]
array but some values get rewritten. Thereafter, we need to use the
node_attrsz[] values.
Fixes a bug when replaying a display list that uses generic vertex
array[16] (at least).
NOTE: This is a candidate for the 8.0 branch.
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Brian Paul [Wed, 1 Feb 2012 15:20:05 +0000 (08:20 -0700)]
nv50: add assertions missed in earlier nv50 commit
Colin Walters [Sat, 14 Jan 2012 14:16:20 +0000 (09:16 -0500)]
build: Note that we don't support srcdir != builddir
Signed-off-by: Dave Airlie <airlied@redhat.com>
Brian Paul [Tue, 31 Jan 2012 14:01:53 +0000 (07:01 -0700)]
nv50: use larger arrays to silence warnings and fix buffer overflows
The warnings were:
nv50_pc_regalloc.c: In function ‘pass_generate_phi_movs’:
nv50_pc_regalloc.c:423:41: warning: array subscript is above array bounds
codegen/nv50_ir_peephole.cpp: In member function ‘bool nv50_ir::MemoryOpt::replaceStFromSt(nv50_ir::Instruction*, nv50_ir::MemoryOpt::Record*)’:
codegen/nv50_ir_peephole.cpp:1475:18: warning: array subscript is above array bounds
codegen/nv50_ir_peephole.cpp:1475:18: warning: array subscript is above array bounds
codegen/nv50_ir_peephole.cpp:1475:18: warning: array subscript is above array bounds
codegen/nv50_ir_peephole.cpp:1475:18: warning: array subscript is above array bounds
And add some assertions to catch this sooner in debug builds.
Brian Paul [Wed, 1 Feb 2012 01:24:07 +0000 (18:24 -0700)]
mesa: reference shared state in glPushAttrib(GL_TEXTURE_BIT)
This fixes a dangling texture object pointer bug hit via wglShareLists().
When we push the GL_TEXTURE_BIT state we may push references to the default
texture objects which are owned by the gl_shared_state object. We don't
want to accidentally delete that shared state while the attribute stack
references shared objects. So keep a reference to it.
NOTE: This is a candidate for the 8.0 branch.
Reviewed-by: José Fonseca <jfonseca@vmware.com>
Brian Paul [Wed, 1 Feb 2012 01:23:03 +0000 (18:23 -0700)]
mesa: use new _mesa_reference_shared_state() function
This cleans up the reference counting of shared context state.
The next patch will use this to fix an actual bug.
NOTE: This is a candidate for the 8.0 branch.
Reviewed-by: José Fonseca <jfonseca@vmware.com>
Brian Paul [Tue, 31 Jan 2012 19:33:38 +0000 (12:33 -0700)]
mesa: remove stray comment in PopAttrib() code
Matt Turner [Wed, 1 Feb 2012 02:34:42 +0000 (21:34 -0500)]
Revert "automake: src/mesa/drivers/osmesa"
This reverts commit
275ac7e5c1fd6c1847a428192fe259e50690fced.
Matt Turner [Wed, 1 Feb 2012 02:33:59 +0000 (21:33 -0500)]
Revert "automake: src/glsl and src/glsl/glcpp"
This reverts commit
9947656168d09f9019600fccc42ca8e0de49b83a.
Matt Turner [Wed, 1 Feb 2012 02:33:21 +0000 (21:33 -0500)]
Revert "src/glsl/glcpp: wire up glcpp-test to make check"
This reverts commit
2bb9f9e1fda61fceb9284cbb4619d7e60e39f190.
Matt Turner [Wed, 1 Feb 2012 02:33:07 +0000 (21:33 -0500)]
Revert "Make sure libGL.so links with libglsl"
This reverts commit
f53e7e981ef35ab64a084c8da6c67bd2d230fe33.
Matt Turner [Wed, 1 Feb 2012 02:32:33 +0000 (21:32 -0500)]
Revert "glsl: Fix optimization tests after converting src/glsl to automake."
This reverts commit
ffe376d5a74dee837dc1a421de29ae551087630f.
Marek Olšák [Tue, 31 Jan 2012 06:47:41 +0000 (07:47 +0100)]
r600g: shorten expressions accessing family and chip_class
Marek Olšák [Tue, 31 Jan 2012 06:44:22 +0000 (07:44 +0100)]
r300g: don't use pipe_context::winsys
Marek Olšák [Tue, 31 Jan 2012 06:32:31 +0000 (07:32 +0100)]
r600g: remove unused variable num_dest_buffers
Marek Olšák [Mon, 30 Jan 2012 08:29:40 +0000 (09:29 +0100)]
r600g: use the new code for streamout flush as well
Marek Olšák [Mon, 30 Jan 2012 08:12:33 +0000 (09:12 +0100)]
r600g: rename r600_reg::flush_flags -> sbu_flags
There is no other use for that.
Marek Olšák [Mon, 30 Jan 2012 08:11:01 +0000 (09:11 +0100)]
r600g: fix computation of how many dwords is needed for a flush at the end of CS
Marek Olšák [Mon, 30 Jan 2012 08:02:30 +0000 (09:02 +0100)]
r600g: remove unused r600_reg::flush_mask
Marek Olšák [Mon, 30 Jan 2012 07:54:01 +0000 (08:54 +0100)]
r600g: remove more dead code
Marek Olšák [Mon, 30 Jan 2012 07:39:32 +0000 (08:39 +0100)]
r600g: remove dead code for tracking relocations
Marek Olšák [Mon, 30 Jan 2012 07:34:13 +0000 (08:34 +0100)]
r600g: remove unused flush code
Marek Olšák [Mon, 30 Jan 2012 05:21:07 +0000 (06:21 +0100)]
r600g: rework cache flushing
This also significantly improves the RV670 flush by using the CB1 flush
*always* and also DEST_BASE_0_ENA, which appears to magically fix some tests.
I am not entirely sure, but it's possible that RV670 flushing is fixed
completely.
v2: fix cayman by flushing texture cache instead of vertex cache
Thanks to Dave Airlie for testing Cayman.
Marek Olšák [Mon, 30 Jan 2012 00:23:14 +0000 (01:23 +0100)]
r600g: add a new simple API for state emission
Marek Olšák [Mon, 30 Jan 2012 03:08:15 +0000 (04:08 +0100)]
r600g: remove redundant pm4 and pm4_cdwords in r600_context
These only mirrored radeon_winsys_cs.
Marek Olšák [Mon, 30 Jan 2012 01:00:51 +0000 (02:00 +0100)]
r600g: consolidate some context_draw code
Marek Olšák [Sun, 29 Jan 2012 22:40:23 +0000 (23:40 +0100)]
r600g: remove the now-useless internal flush callback
Marek Olšák [Sun, 29 Jan 2012 22:35:10 +0000 (23:35 +0100)]
r600g: don't initialize the screen and winsys pointer twice
Marek Olšák [Sun, 29 Jan 2012 22:25:42 +0000 (23:25 +0100)]
r600g: merge r600_context with r600_pipe_context
The split made no sense.
Marek Olšák [Sun, 29 Jan 2012 22:13:39 +0000 (23:13 +0100)]
r600g: remove u8,u16,u32,u64 types
Paul Berry [Tue, 31 Jan 2012 02:53:09 +0000 (18:53 -0800)]
glsl: Fix optimization tests after converting src/glsl to automake.
Commit
99476561 (automake: src/glsl and src/glsl/glcpp) changed the
build system so that src/glsl/glsl_test is not built by default. This
inadvertently broke "make check", since the tests in
src/glsl/tests/lower_jumps (which are run by "make check") rely on
glsl_test.
This patch ensures that "make check" builds glsl_test before running
any tests.
Reviewed-by: Matt Turner <mattst88@gmail.com>
Matt Turner [Tue, 31 Jan 2012 16:54:24 +0000 (11:54 -0500)]
Make sure libGL.so links with libglsl
Can't link against *.la files if we're not using libtool to link.
Fixes undefined symbol: _ZN23ir_hierarchical_visitor5visitEP11ir_variable
Christian König [Tue, 31 Jan 2012 13:49:07 +0000 (14:49 +0100)]
vl: fix some missing prototypes error
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=45444
Signed-off-by: Christian König <deathsimple@vodafone.de>
Brian Paul [Tue, 31 Jan 2012 14:44:53 +0000 (07:44 -0700)]
osmesa: set RefCount = 1 in new_osmesa_renderbuffer()
This was lost during the renderbuffer overhaul work. Fixes a failed
refcount assertion.
Vinson Lee [Sat, 28 Jan 2012 06:36:04 +0000 (07:36 +0100)]
osmesa: Fix osmesa_context.DataType type.
Fixes these GCC warnings.
osmesa.c: In function ‘osmesa_renderbuffer_storage’:
osmesa.c:417: warning: comparison is always false due to limited range of data type
osmesa.c:423: warning: comparison is always false due to limited range of data type
osmesa.c:431: warning: comparison is always false due to limited range of data type
osmesa.c:437: warning: comparison is always false due to limited range of data type
osmesa.c:447: warning: comparison is always false due to limited range of data type
osmesa.c:453: warning: comparison is always false due to limited range of data type
osmesa.c:463: warning: comparison is always false due to limited range of data type
osmesa.c:466: warning: comparison is always false due to limited range of data type
osmesa.c:476: warning: comparison is always false due to limited range of data type
osmesa.c:479: warning: comparison is always false due to limited range of data type
Signed-off-by: Vinson Lee <vlee@freedesktop.org>
Signed-off-by: Brian Paul <brianp@vmware.com>
Brian Paul [Tue, 31 Jan 2012 14:01:29 +0000 (07:01 -0700)]
vega: memset data array to zero to silence uninitialized var warnings
ojab [Tue, 31 Jan 2012 07:43:37 +0000 (11:43 +0400)]
Initialize only native LLVM Disassembler.
Signed-off-by: José Fonseca <jfonseca@vmware.com>
Matt Turner [Sat, 28 Jan 2012 04:04:03 +0000 (23:04 -0500)]
Remove autoreconf generated files
Acked-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Matt Turner <mattst88@gmail.com>
Matt Turner [Sun, 29 Jan 2012 03:42:04 +0000 (22:42 -0500)]
src/glsl/glcpp: wire up glcpp-test to make check
Reviewed-by: Eric Anholt <eric@anholt.net>
Tested-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Matt Turner <mattst88@gmail.com>
Matt Turner [Sun, 29 Jan 2012 03:08:39 +0000 (22:08 -0500)]
glcpp-test: don't return failure if valgrind tests aren't run
Success was (tests-passed AND valgrind-tests-passed) but this meant that
if the valgrind tests weren't run it would be considered a failure.
The logic is now (tests-passed AND (!valgrind OR valgrind-tests-passed))
which lets us return success if the valgrind tests aren't run.
Reviewed-by: Eric Anholt <eric@anholt.net>
Tested-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Matt Turner <mattst88@gmail.com>
Matt Turner [Fri, 27 Jan 2012 05:02:47 +0000 (00:02 -0500)]
automake: src/glsl and src/glsl/glcpp
Reviewed-by: Eric Anholt <eric@anholt.net>
Tested-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Matt Turner <mattst88@gmail.com>
Matt Turner [Fri, 13 Jan 2012 19:31:39 +0000 (14:31 -0500)]
autoconf: use AC_PROG_YACC/LEX
Needed for automake. Using AC_PROG_PATH(bison/flex) causes automake to
fail to build .y and .l files.
It is up to the builder to use bison/flex instead of yacc/lex.
Reviewed-by: Eric Anholt <eric@anholt.net>
Tested-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Matt Turner <mattst88@gmail.com>
Matt Turner [Sun, 29 Jan 2012 01:13:51 +0000 (20:13 -0500)]
glsl: rename Makefile.sources' _SOURCES variables
automake uses variables named *_SOURCES.
Reviewed-by: Eric Anholt <eric@anholt.net>
Tested-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Matt Turner <mattst88@gmail.com>
Matt Turner [Fri, 27 Jan 2012 03:37:06 +0000 (22:37 -0500)]
automake: src/mesa/drivers/osmesa
Kenneth Graunke [Sun, 29 Jan 2012 00:58:37 +0000 (16:58 -0800)]
glsl: Rename class variable_entry to ir_variable_refcount_entry.
Exporting a publicly visible class with a generic name like
"variable_entry" via ir_variable_refcount.h is kind of mean.
Many IR transformers would like to define their own "variable_entry"
class. If they accidentally include this header, the compiler/linker
may get confused and try to instantiate the wrong variable_entry class,
leading to bizarre runtime crashes.
The hope is that renaming this one will allow .cpp files to safely
declare and use their own file-scope "variable_entry" classes.
This avoids crashes caused by converting src/glsl to automake.
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-and-tested-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Marek Olšák [Sun, 29 Jan 2012 16:18:09 +0000 (17:18 +0100)]
r600g: get rid of r600_context_reg
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Marek Olšák [Sun, 29 Jan 2012 16:17:08 +0000 (17:17 +0100)]
r600g: don't use r600_context_reg on r6xx-r7xx
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Marek Olšák [Sun, 29 Jan 2012 15:56:02 +0000 (16:56 +0100)]
r600g: don't use r600_context_reg on evergreen
Just getting rid of things which use the register mask.
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Marek Olšák [Sun, 29 Jan 2012 06:39:08 +0000 (07:39 +0100)]
r600g: get rid of the mask in r600_pipe_reg
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Marek Olšák [Sun, 29 Jan 2012 06:34:25 +0000 (07:34 +0100)]
r600g: get rid of the mask parameter in pipe_state_add_reg
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Marek Olšák [Sun, 29 Jan 2012 06:21:03 +0000 (07:21 +0100)]
r600g: don't use register mask for TA_CNTL_AUX
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Marek Olšák [Sun, 29 Jan 2012 06:16:10 +0000 (07:16 +0100)]
r600g: don't use register mask for PA_CL_CLIP_CNTL
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Marek Olšák [Sun, 29 Jan 2012 05:31:47 +0000 (06:31 +0100)]
r600g: don't use register mask for PA_CL_VS_OUT_CNTL
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Marek Olšák [Sun, 29 Jan 2012 05:04:14 +0000 (06:04 +0100)]
r600g: set full register mask for PA_CL_CLIP_CNTL
We don't set the other bits anywhere else.
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Marek Olšák [Sun, 29 Jan 2012 04:48:28 +0000 (05:48 +0100)]
r600g: don't use register mask for PA_SU_SC_MODE_CNTL
It's always emitted in draw_vbo.
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Marek Olšák [Sun, 29 Jan 2012 04:22:00 +0000 (05:22 +0100)]
r600g: don't add PA_SC_LINE_STIPPLE to rasterizer_state
It's always emitted in draw_vbo.
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>