Ian Romanick [Mon, 30 Aug 2010 18:58:04 +0000 (11:58 -0700)]
glsl2: Parse #pragma lines
All pragmas are currently ignored. Also, the error messages when a
pragma is used incorrectly (i.e., '#pragma debug(on)' inside a
function) are crap, but I think this is sufficient for now.
Fixes piglit test cases pragma-0[1-8].(vert|frag).
Kenneth Graunke [Mon, 30 Aug 2010 19:22:39 +0000 (12:22 -0700)]
Fix inverted version checks in check_extra.
Previously, if an attribute was enabled by either a specific GL version
or an extension, the check would require -both- to be enabled. This bug
was not discovered earlier because version checks are currently only ever
used on their own.
Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Jerome Glisse [Mon, 30 Aug 2010 01:01:51 +0000 (21:01 -0400)]
r600g: precompute some of the hw state
Idea is to build hw state at pipe state creation and
reuse them while keeping a non PM4 packet interface
btw winsys & pipe driver. This commit also force rebuild
of pm4 packet on each call to radeon_state_pm4 which
in turn slow down everythings, this will be addressed.
Signed-off-by: Jerome Glisse <jglisse@redhat.com>
Jerome Glisse [Sat, 28 Aug 2010 21:47:13 +0000 (17:47 -0400)]
r600g: fix depth buffer decompression after states rework
Signed-off-by: Jerome Glisse <jglisse@redhat.com>
Dave Airlie [Thu, 26 Aug 2010 04:55:48 +0000 (14:55 +1000)]
r600g: fixup states generation in winsys.
The current states code had an unhealthy relationship between
that had to somehow magically align themselves, editing either
place meant renumbering all states after the one you were on,
and it was pretty unapproachable code.
This replaces the huge types structures with a simple type + sub
type struct, which is keyed on an stype enum in radeon.h. Each
stype can have a per-shader type subclassing (4 types supported,
PS/VS/GS/FS), and also has a number of states per-subtype. So you
have 256 constants per 4 shaders per one CONSTANT stype.
The interface from the driver is changed to pass in the tuple,
(stype, id, shader_type), and we look for this. If
radeon_state_shader ever shows up on profile, it could use a
hashtable based on stype/shader_type to speed things up.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Luca Barbieri [Mon, 30 Aug 2010 18:48:49 +0000 (20:48 +0200)]
glapi: fix generator which got out of sync with the codebase
The __GLapi typedef was removed in
c356f5867f2c1fad7155df538b9affa8dbdcf869,
but the code generator hasn't been updated.
Eric Anholt [Mon, 30 Aug 2010 18:19:30 +0000 (11:19 -0700)]
i965: Clear the cached constant buffer entry in the VS at control flow.
Fixes the 7 regressions with constant buffers forced on with piglit -t
glsl (glsl-vs-if-*).
Eric Anholt [Mon, 30 Aug 2010 17:47:05 +0000 (10:47 -0700)]
i965: Align the number of payload regs to 2 again in 16-wide mode.
Fixes a regression in point-line-no-cull and glean/paths tests since
501c9dc62774a73c080d500a1eab773b0da9577e.
Cedric Vivier [Mon, 30 Aug 2010 17:40:39 +0000 (10:40 -0700)]
i965: Apply the rest of the old-libdrm guard patch.
Bug #29855
Eric Anholt [Sun, 29 Aug 2010 06:31:09 +0000 (23:31 -0700)]
i965: Add support for loops to the new FS backend.
This includes a handy little safety check to prevent the loop from
going "too long", as permitted by the spec. I haven't gone out of my
way to test it, though…
Fixes 20 more piglit tests.
Eric Anholt [Sun, 29 Aug 2010 06:18:18 +0000 (23:18 -0700)]
i965: Make brw_CONT and brw_BREAK take the pop count.
We always need to set it, so pass it in.
Eric Anholt [Sun, 29 Aug 2010 05:56:33 +0000 (22:56 -0700)]
i965: Add "discard" support to the new FS backend.
Fixes 3 testcases related to discard.
Eric Anholt [Sun, 29 Aug 2010 05:42:01 +0000 (22:42 -0700)]
i965: Fix the new implementation of ir_unop_sign to match brw_wm_emit.c
Like the comparison operations, this suffered from CMP only setting
the low bit. Doing the AND instructions would be the same instruction
count as the more obvious conditional moves, so do cond moves.
Fixes glsl-fs-sign and 6 other cases, like trig functions that use
sign() internally.
Eric Anholt [Sun, 29 Aug 2010 05:34:30 +0000 (22:34 -0700)]
i965: Add support for texturing with bias to i965 FS backend.
Fixes 5 piglit tests for bias. Note that LOD is a 1.30 feature and
not yet supported.
José Fonseca [Mon, 30 Aug 2010 13:12:01 +0000 (14:12 +0100)]
glut: Silence missing initializer warning.
José Fonseca [Mon, 30 Aug 2010 12:59:24 +0000 (13:59 +0100)]
mesa: Return after assertion failure.
Addresses the warnings:
warning: ‘target’ may be used uninitialized in this function
warning: ‘target_string’ may be used uninitialized in this function
José Fonseca [Mon, 7 Jun 2010 11:05:18 +0000 (12:05 +0100)]
gallivm: Compute the 4 texel offsets for linear filtering en ensemble.
José Fonseca [Mon, 30 Aug 2010 12:53:15 +0000 (13:53 +0100)]
glsl: Silence unused variable warning.
José Fonseca [Mon, 30 Aug 2010 12:48:21 +0000 (13:48 +0100)]
mesa: Fix _mesa_lookup_parameter_constant's return value.
Fixes gcc warning
In function ‘_mesa_add_unnamed_constant’:
warning: ‘pos’ may be used uninitialized in this function
but also what appears to be a bug.
José Fonseca [Sun, 29 Aug 2010 11:05:36 +0000 (12:05 +0100)]
gallivm: Disable LLVM's pretty stack trace dumper.
By default LLVM adds a signal handler to output a pretty stack trace.
This signal handler is never removed, causing problems when unloading
the shared object where the gallium driver resides.
Thanks to Chris Li for finding this.
José Fonseca [Sat, 21 Aug 2010 10:29:41 +0000 (11:29 +0100)]
gallivm: Correct copy'n'pasted comments.
José Fonseca [Sat, 21 Aug 2010 10:31:22 +0000 (11:31 +0100)]
gallivm: Fix lp_build_sum_vector.
The result is scalar, so when argument is zero/undef we can pass vector
zero/undef.
Also, support the scalar case.
Michal Krol [Fri, 27 Aug 2010 11:24:47 +0000 (13:24 +0200)]
svga: Fix CMP translation for vertex shader targets.
SVGA3DOP_CMP is not supported for vertex shaders;
use SLT + LRP instead.
José Fonseca [Sun, 15 Aug 2010 12:36:02 +0000 (13:36 +0100)]
svga: Re-emit bound rendertargets and texture samplers at the beginning of every command buffer.
Only non null resources.
To ensure that relocations are emitted for every resource currently
referred.
Marek Olšák [Wed, 25 Aug 2010 03:25:41 +0000 (05:25 +0200)]
st/mesa: set the MaxVarying GLSL constant
Marek Olšák [Mon, 30 Aug 2010 11:25:07 +0000 (13:25 +0200)]
r300g: fix warning in winsys
Dave Airlie [Mon, 30 Aug 2010 06:22:54 +0000 (16:22 +1000)]
r600g: add DST opcode support.
Dave Airlie [Mon, 30 Aug 2010 06:09:39 +0000 (16:09 +1000)]
r600g: add SCS support.
Dave Airlie [Mon, 30 Aug 2010 05:50:33 +0000 (15:50 +1000)]
r600g: fix warning introduced by last commit.
Dave Airlie [Mon, 30 Aug 2010 05:19:20 +0000 (15:19 +1000)]
r600g: add initial relative support to assembler
passes another ~20 piglits.
/me starts to run out low hanging fruit around now.
Ian Romanick [Mon, 30 Aug 2010 05:07:49 +0000 (22:07 -0700)]
linker: Treat sized and unsized array types as the same
If two shaders contain variables declared with array types that have
the same base type but one is sized and the other is not, linking
should succeed. I'm not super pleased with the way this is
implemented, and I am more convinced than ever that we need more
linker tests. We especially need "negative" tests.
Fixes bugzilla #29697 and piglit test glsl-link-array-01.
Dave Airlie [Mon, 30 Aug 2010 04:41:09 +0000 (14:41 +1000)]
r600g: add KILP support
passes glsl1-discard tests
Dave Airlie [Mon, 30 Aug 2010 04:13:01 +0000 (14:13 +1000)]
r600g: fix SSG and op3 neg writing
8 more piglits, mainly the two SSG tests.
Dave Airlie [Fri, 27 Aug 2010 06:08:55 +0000 (16:08 +1000)]
r600g : add basic loop support.
Adds BGNLOOP, BRK, CONT, ENDLOOP support, ported from r600c.
17 piglits more on r300g.tests.
Bas Nieuwenhuizen [Sun, 29 Aug 2010 09:19:23 +0000 (11:19 +0200)]
r600g: use the values from the correct literals
Created an array for literals as we should not always use the last declared literal.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Bas Nieuwenhuizen [Sun, 29 Aug 2010 09:19:22 +0000 (11:19 +0200)]
r600g: added literals where needed for POW instruction
Fixes size calculation for the bytecode buffer.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Richard Li [Sun, 29 Aug 2010 23:27:46 +0000 (19:27 -0400)]
evergreen : fix shader const allocation and instruction bugs.
Vinson Lee [Sun, 29 Aug 2010 21:05:07 +0000 (14:05 -0700)]
glsl: Initialize data in ast_function_expression::hir.
Completely initialize data that is passed to ir_constant constructor.
Fixes piglit glsl-orangebook-ch06-bump valgrind uninitialized variable
error on softpipe and llvmpipe.
Vinson Lee [Sun, 29 Aug 2010 20:15:56 +0000 (13:15 -0700)]
glsl: Completely initialize value member in ir_constant constructor.
The
ir_constant::ir_constant(const struct glsl_type *type, exec_list *value_list)
did not completely initialize the entire value member.
Fixes piglit glsl-fs-sampler-numbering-2 valgrind uninitialized value
error in softpipe and llvmpipe.
Vinson Lee [Sun, 29 Aug 2010 19:19:57 +0000 (12:19 -0700)]
glsl: Initialize variable in ir_swizzle::constant_expression_value.
Complete initialize data passed to ir_constant constructor.
Fixes piglit glsl-mat-from-int-ctor-02 valgrind unintialized variable
error with softpipe and llvmpipe.
Vinson Lee [Sun, 29 Aug 2010 18:48:02 +0000 (11:48 -0700)]
glsl: Initialize data in read_constant.
Completely initialize data that is passed into a ir_constant constructor.
Fixes piglit glsl-fs-mix valgrind uninitialized variable error on
softpipe and llvmpipe.
Vinson Lee [Sun, 29 Aug 2010 18:31:33 +0000 (11:31 -0700)]
ir_to_mesa: Initialize variable in ir_to_mesa_visitor::visit.
Fixes piglit glsl-fs-loop valgrind uninitialized value error on softpipe
and llvmpipe.
Dave Airlie [Sat, 28 Aug 2010 09:01:49 +0000 (19:01 +1000)]
r600g: drop file I added by mistake in a previous commit
Vinson Lee [Sun, 29 Aug 2010 06:55:51 +0000 (23:55 -0700)]
glsl: Initialize the rest of values of ir_constant::value.
Fixes valgrind uninitialized value errors in the piglit shader tests for
softpipe and llvmpipe.
Vinson Lee [Sun, 29 Aug 2010 05:15:37 +0000 (22:15 -0700)]
gallium: Remove unnecessary header from p_state.h.
Remove p_screen.h.
Vinson Lee [Sun, 29 Aug 2010 05:12:55 +0000 (22:12 -0700)]
nvfx: Remove util_is_pot in favor of util_is_power_of_two.
This is a follow up to commit
89b2897220acfacdc431f138377fbcec9f0ea812.
Vinson Lee [Sun, 29 Aug 2010 04:46:41 +0000 (21:46 -0700)]
util: Include missing header in u_draw.h.
Include p_state.h for complete type to pipe_draw_info.
Vinson Lee [Sun, 29 Aug 2010 04:42:28 +0000 (21:42 -0700)]
util: Add forward declaration in u_transfer.h.
Marek Olšák [Sun, 29 Aug 2010 04:08:24 +0000 (06:08 +0200)]
r300g,u_blitter: use u_framebuffer
Removing another function duplication in u_blitter.
Marek Olšák [Sun, 29 Aug 2010 04:03:39 +0000 (06:03 +0200)]
util: remove util_is_pot in favor of util_is_power_of_two
The function was duplicated.
Eric Anholt [Sat, 28 Aug 2010 21:43:50 +0000 (14:43 -0700)]
i965: Add initial support for texturing to the new FS backend.
Fixes 11 piglit tests.
Eric Anholt [Sun, 29 Aug 2010 02:55:53 +0000 (19:55 -0700)]
i965: Add disasm for gen5 sampler messages.
Cedric Vivier [Sun, 29 Aug 2010 03:01:46 +0000 (20:01 -0700)]
i965: Move libdrm/C++ hack introduced in
fa2deb3d to intel_context.h
Fixes build on Linux/GCC 4.4 as libdrm includes are also used by other
brw_fs_*.cpp files.
Bug #29855
Vinson Lee [Sat, 28 Aug 2010 21:24:42 +0000 (14:24 -0700)]
st/mesa: Include missing header in st_mesa_to_tgsi.c.
Include p_screen.h for complete type to pipe_screen.
Vinson Lee [Sat, 28 Aug 2010 21:21:28 +0000 (14:21 -0700)]
softpipe: Include missing header in sp_flush.c.
Include p_screen.h for complete type to pipe_screen.
Vinson Lee [Sat, 28 Aug 2010 21:18:57 +0000 (14:18 -0700)]
draw: Include missing header in draw_vs_llvm.c.
Include p_screen.h for completely type to pipe_screen.
Vinson Lee [Sat, 28 Aug 2010 21:14:33 +0000 (14:14 -0700)]
llvmpipe: Include missing header in lp_flush.c.
Include p_screen.h for complete type to pipe_screen.
Marek Olšák [Sat, 28 Aug 2010 05:54:36 +0000 (07:54 +0200)]
r300g: fix blitting between 2D NPOT mipmaps
Even though MIP filtering is not supported, we can bind an arbitrary mipmap
as the zero mipmap level.
NPOT textures now follow GL_TEXTURE_BASE_LEVEL and GL_TEXTURE_MIN_LOD.
This fixes piglit/fbo-copyteximage.
Mathias Fröhlich [Sat, 28 Aug 2010 16:16:41 +0000 (18:16 +0200)]
r300g: fix min/max lod computation
Marek Olšák [Sat, 28 Aug 2010 05:51:55 +0000 (07:51 +0200)]
r300g: set the correct value in PVS_NUM_CNTLRS
As per docs.
Vinson Lee [Sat, 28 Aug 2010 07:29:02 +0000 (00:29 -0700)]
llvmpipe: Remove unnecessary header.
Ian Romanick [Thu, 19 Aug 2010 00:53:47 +0000 (17:53 -0700)]
glsl2: Decompose matrix comparison into vector operations
Jakob Bornecrantz [Fri, 27 Aug 2010 23:30:00 +0000 (00:30 +0100)]
trace: Don't try to dump the rgba array if null
Eric Anholt [Fri, 27 Aug 2010 22:34:42 +0000 (15:34 -0700)]
glsl: Rename a couple of common variable names in mat_op_to_vec.
It was easy while typing implementations to accidentally overwrite the
original expression or assignment variables.
Eric Anholt [Fri, 27 Aug 2010 22:32:59 +0000 (15:32 -0700)]
glsl: Make mat_op_to_vec allocate out of the IR's parent.
This will reduce memory consumption of compiled shaders by not
dragging optimized-out children around.
Eric Anholt [Fri, 27 Aug 2010 23:04:16 +0000 (16:04 -0700)]
i965: Set the pop count on BRK/CONT inside of an if statement in the FS.
This is the same as
8de8c97275e9555183a7e8f2238143657bbe60b2 for the
VS, and fixes glsl-fs-if-nested-loop and the mandelbrot demo.
Bug #29498
Eric Anholt [Fri, 27 Aug 2010 22:24:23 +0000 (15:24 -0700)]
glsl: Regenerate for double destroy fix.
Eric Anholt [Fri, 27 Aug 2010 22:23:29 +0000 (15:23 -0700)]
glsl: Protect against double compiler-destroy.
DRI was doing teardown when we close the last screen, then an atexit()
was added to call it as well.
Eric Anholt [Fri, 27 Aug 2010 21:43:39 +0000 (14:43 -0700)]
dri: Get prototype for _mesa_destroy_compiler().
Bug #29665.
Eric Anholt [Fri, 27 Aug 2010 21:15:42 +0000 (14:15 -0700)]
i965: Don't strip negate/abs flags when assigning uniform locations.
Fixes glsl-algebraic-sub-zero-4.
Eric Anholt [Fri, 27 Aug 2010 21:09:05 +0000 (14:09 -0700)]
i965: Add missing handling for BRW_OPCODE_SEL.
Fixes 4 piglit tests about min, max, and clamp.
Eric Anholt [Fri, 27 Aug 2010 20:49:09 +0000 (13:49 -0700)]
i965: Mask out higher bits of the result of BRW_CMP producing a boolean.
When it says it sets the LSB, that's not just a hint as to where the
result goes. Only the LSB is modified. Fixes 20 piglit cases.
Eric Anholt [Fri, 27 Aug 2010 20:47:37 +0000 (13:47 -0700)]
i965: Fix the types of immediate integer values.
When we're trying to do integer ops, handing a float in doesn't help.
Eric Anholt [Fri, 27 Aug 2010 20:29:45 +0000 (13:29 -0700)]
i965: Add translation for RNDD and RNDZ.
Fixes:
glsl-fs-any.
glsl1-integer division with uniform var
Eric Anholt [Fri, 27 Aug 2010 20:24:41 +0000 (13:24 -0700)]
i965: Add support for ir_binop_mod using do_mod_to_fract.
Fixes glsl-fs-mod.
Jerome Glisse [Fri, 27 Aug 2010 20:52:29 +0000 (16:52 -0400)]
r600g: fix vbo size
Silence the kernel, vbo size is size - 1.
Signed-off-by: Jerome Glisse <jglisse@redhat.com>
Brian Paul [Fri, 27 Aug 2010 20:35:52 +0000 (14:35 -0600)]
mesa: move null ptr check (fdo bug 29843)
Nick Bowler [Fri, 27 Aug 2010 00:52:30 +0000 (17:52 -0700)]
mesa: Use the format info to identify packed depth/stencil formats.
Due to a misunderstanding of the Z24_X8 and X8_Z24 formats, the earlier
patch created depth/stencil wrappers for them. This broke swrast.
Use the format info instead, which only identifies Z24_S8 and S8_Z24 as
packed depth/stencil. It also has the advantage of being nicer code.
Signed-off-by: Nick Bowler <nbowler@draconx.ca>
Signed-off-by: Brian Paul <brianp@vmware.com>
Brian Paul [Fri, 27 Aug 2010 17:54:32 +0000 (11:54 -0600)]
mesa: use atexit() handler to release GLSL compiler memory
This releases a bunch of memory that was showing up as leaks with
valgrind.
If atexit() isn't widely supported we may need to add some #ifdef
tests around the call.
Brian Paul [Fri, 27 Aug 2010 17:53:19 +0000 (11:53 -0600)]
glsl2: restructure header file for C++ and C inclusion
As it was, the header could not be cleanly #included by a C source.
Brian Paul [Fri, 27 Aug 2010 17:15:03 +0000 (11:15 -0600)]
glsl2: remove 'extern' keyword in .c file
Eric Anholt [Fri, 27 Aug 2010 20:19:28 +0000 (13:19 -0700)]
i965: Fix swapped instructions in ir_unop_abs and ir_unop_neg.
Fixes glsl-fs-neg and 5 other tests.
Eric Anholt [Fri, 27 Aug 2010 20:14:15 +0000 (13:14 -0700)]
i965: Add generate() handling for AND, OR, XOR.
10 more piglit tests pass.
Eric Anholt [Fri, 27 Aug 2010 19:54:12 +0000 (12:54 -0700)]
i965: Add support for if instructions in the new FS backend.
20 more piglit tests pass.
Eric Anholt [Fri, 27 Aug 2010 19:53:48 +0000 (12:53 -0700)]
i965: When encountering an unknown opcode in new FS backend, print its name.
Eric Anholt [Fri, 27 Aug 2010 19:19:30 +0000 (12:19 -0700)]
i965: Fix the maximum grf counting in the new FS backend.
glsl-algebraic-rcp-rsq managed to use 33 registers, and we claimed to
only use 32, so the write to g32 would go stomping over the precious
g0 of some other thread.
Eric Anholt [Fri, 27 Aug 2010 19:02:53 +0000 (12:02 -0700)]
i965: Validate the IR tree after doing our custom optimization passes.
This wouldn't catch the last failure fixed in them, because we don't
validate assignments well (due to the fact that we've got a pretty
glaring inconsistency in how we handle assignment writemasking), but
it could catch other failure we may produce.
Eric Anholt [Fri, 27 Aug 2010 17:44:04 +0000 (10:44 -0700)]
i965: Add a bit of support for matrices to the new FS.
Eric Anholt [Fri, 27 Aug 2010 18:05:47 +0000 (11:05 -0700)]
i965: Fix destination writemasking in the new FS.
Eric Anholt [Fri, 27 Aug 2010 19:00:29 +0000 (12:00 -0700)]
i965: Fix swizzling in vector splitting for the new FS backend.
We weren't smearing a component of a split RHS out to reach an unsplit
LHS's writemask, so gl_FragColor (always unsplit) would often get
uninitialized values.
Fixes: glsl-algebraic-add-add-1 (and probably many others).
Zack Rusin [Fri, 27 Aug 2010 17:09:38 +0000 (13:09 -0400)]
graw: fix the build (missing header)
Brian Paul [Fri, 27 Aug 2010 16:51:47 +0000 (10:51 -0600)]
mesa: free the fallback texture object in free_shared_state()
Brian Paul [Fri, 27 Aug 2010 16:21:59 +0000 (10:21 -0600)]
mesa: fix double-underscore naming
Keith Whitwell [Fri, 27 Aug 2010 12:40:23 +0000 (13:40 +0100)]
llvmpipe: use util_iround in place of round
Fix mingw build.
Keith Whitwell [Fri, 27 Aug 2010 12:29:00 +0000 (13:29 +0100)]
util: fix typo in MAX4
Thanks to Michal for spotting it.
Keith Whitwell [Fri, 27 Aug 2010 10:03:58 +0000 (11:03 +0100)]
llvmpipe: eliminate tri->dx, tri->dy values
Use an internal struct for line setup information.
Hui Qi Tay [Tue, 10 Aug 2010 10:41:32 +0000 (11:41 +0100)]
llvmpipe: point sprites rasterization
Point sprites now done in the rasterizer setup code instead of
going through the draw module.
Hui Qi Tay [Fri, 27 Aug 2010 09:46:19 +0000 (10:46 +0100)]
llvmpipe: native point rasterization with better pixel rasterization
A few subpixel_snap and fixed width changes.
Conflicts:
src/gallium/drivers/llvmpipe/lp_setup_point.c
Hui Qi Tay [Fri, 27 Aug 2010 09:37:09 +0000 (10:37 +0100)]
llvmpipe: native point rasterization
Conflicts:
src/gallium/drivers/llvmpipe/lp_setup_context.h
src/gallium/drivers/llvmpipe/lp_setup_line.c
src/gallium/drivers/llvmpipe/lp_setup_tri.c
Keith Whitwell [Thu, 26 Aug 2010 19:09:22 +0000 (20:09 +0100)]
llvmpipe: update line rasterization code to current master