Kenneth Graunke [Tue, 19 Oct 2010 00:25:52 +0000 (17:25 -0700)]
glsl: Fix copy and paste error in ast_bit_and node creation.
All & operations were incorrectly being generated as ast_bit_or.
Eric Anholt [Mon, 18 Oct 2010 21:12:12 +0000 (14:12 -0700)]
i965: Avoid blits in BufferCopySubdata on gen6.
Fixes glean/bufferObject.
Eric Anholt [Mon, 18 Oct 2010 20:11:29 +0000 (13:11 -0700)]
i965: Fix scissor-offscreen on gen6 like we did pre-gen6.
Eric Anholt [Mon, 18 Oct 2010 19:41:10 +0000 (12:41 -0700)]
i965: Assert out on gen6 VS constant buffer reads that hang the GPU for now.
Eric Anholt [Mon, 18 Oct 2010 18:32:19 +0000 (11:32 -0700)]
i965: Fix assertion failure on gen6 BufferSubData to busy BO.
Fixes fbo-blit and probably several other tests.
Eric Anholt [Mon, 18 Oct 2010 18:13:26 +0000 (11:13 -0700)]
i965: Fix a weirdness in NOT handling.
XOR makes much more sense. Note that the previous code would have
failed for not(not(x)), but that gets optimized out.
Eric Anholt [Mon, 18 Oct 2010 17:59:46 +0000 (10:59 -0700)]
i965: Disable the debug printf I added for FS disasm.
Kenneth Graunke [Mon, 18 Oct 2010 19:21:20 +0000 (12:21 -0700)]
i965: Add missing "break" statement.
Otherwise, it would try to handle arrays as structures, use
uninitialized memory, and crash.
José Fonseca [Mon, 18 Oct 2010 16:35:21 +0000 (09:35 -0700)]
llvmpipe: Don't test rounding of x.5 numbers.
SSE4.1 has different rules, and so far this doesn't seem to cause any
problems with conformance test suites.
José Fonseca [Mon, 18 Oct 2010 16:32:35 +0000 (09:32 -0700)]
gallivm: Add a note about SSE4.1's nearest mode rounding.
Brian Rogers [Sun, 17 Oct 2010 21:21:06 +0000 (14:21 -0700)]
mesa: Add missing else in do_row_3D
This fixes erroneous "bad format in do_row()" messages
Signed-off-by: Brian Paul <brianp@vmware.com>
Brian Paul [Mon, 18 Oct 2010 13:59:02 +0000 (07:59 -0600)]
llvmpipe: remove lp_setup_coef*.c files from Makefile
Victor Tseng [Mon, 18 Oct 2010 13:55:37 +0000 (07:55 -0600)]
egl/i965: include inline_wrapper_sw_helper.h
Signed-off-by: Brian Paul <brianp@vmware.com>
Kenneth Graunke [Mon, 18 Oct 2010 07:24:46 +0000 (00:24 -0700)]
glsl: Don't return NULL IR for erroneous bit-shift operators.
Existing code relies on IR being generated (possibly with error type)
rather than returning NULL. So, don't break - go ahead and generate the
operation. As long as an error is flagged, things will work out.
Fixes fd.o bug #30914.
Dave Airlie [Sun, 17 Oct 2010 23:45:58 +0000 (09:45 +1000)]
r600g: retrieve tiling info from kernel for shared buffers.
we need to know if the back is tiled so we can blit from it properly.
Dave Airlie [Wed, 13 Oct 2010 00:44:46 +0000 (10:44 +1000)]
r600g: fix transfer function for tiling.
this makes readback with tiled back work better.
Dave Airlie [Mon, 18 Oct 2010 02:05:27 +0000 (12:05 +1000)]
r600g: attempt to cleanup depth blit
cleanup what I'm nearly sure is unnecessary work in the depth blit code.
Dave Airlie [Mon, 18 Oct 2010 03:23:34 +0000 (13:23 +1000)]
r600g: depth needs to bound to ds
Dave Airlie [Mon, 18 Oct 2010 02:05:38 +0000 (12:05 +1000)]
r600g: fix typo in tiling setup cb code.
Dave Airlie [Mon, 18 Oct 2010 02:04:57 +0000 (12:04 +1000)]
r600g: do proper tracking of views/samplers.
we need to do pretty much what r300g does in for this, this fixes some
issues seen while working on tiling.
Keith Whitwell [Mon, 18 Oct 2010 02:23:40 +0000 (19:23 -0700)]
llvmpipe: remove unused arg from jit_setup_tri function
Keith Whitwell [Mon, 18 Oct 2010 02:11:47 +0000 (19:11 -0700)]
llvmpipe: remove unused file
Keith Whitwell [Mon, 18 Oct 2010 02:03:42 +0000 (19:03 -0700)]
Merge remote branch 'origin/master' into lp-setup-llvm
Conflicts:
src/gallium/drivers/llvmpipe/lp_setup_coef.c
src/gallium/drivers/llvmpipe/lp_setup_coef.h
src/gallium/drivers/llvmpipe/lp_setup_coef_intrin.c
src/gallium/drivers/llvmpipe/lp_setup_point.c
src/gallium/drivers/llvmpipe/lp_setup_tri.c
src/gallium/drivers/llvmpipe/lp_state_derived.c
src/gallium/drivers/llvmpipe/lp_state_fs.h
Keith Whitwell [Mon, 18 Oct 2010 01:48:11 +0000 (18:48 -0700)]
llvmpipe: fail cleanly on malloc failure in lp_setup_alloc_triangle
Keith Whitwell [Mon, 18 Oct 2010 01:29:28 +0000 (18:29 -0700)]
llvmpipe: remove setup fallback path
José Fonseca [Sun, 17 Oct 2010 20:41:45 +0000 (13:41 -0700)]
gallivm: Comment lp_build_insert_new_block().
Dave Airlie [Fri, 8 Oct 2010 01:57:04 +0000 (11:57 +1000)]
r600g: set tiling bits in hw state
Dave Airlie [Fri, 8 Oct 2010 01:56:43 +0000 (11:56 +1000)]
r600g: get tiling info from kernel
Dave Airlie [Fri, 8 Oct 2010 01:56:12 +0000 (11:56 +1000)]
r600g: add defines for tiling
Dave Airlie [Wed, 6 Oct 2010 02:49:26 +0000 (12:49 +1000)]
r600g: switch to a common formats.h file since they are in different regs
Vinson Lee [Sun, 17 Oct 2010 21:09:53 +0000 (14:09 -0700)]
llvmpipe: Return non-zero exit code for lp_test_round failures.
José Fonseca [Sun, 17 Oct 2010 17:15:15 +0000 (10:15 -0700)]
llvmpipe: Initialize bld ctx via lp_build_context_init instead of ad-hoc and broken code.
José Fonseca [Sun, 17 Oct 2010 16:58:04 +0000 (09:58 -0700)]
llvmpipe: Fix bad refactoring.
'i' and 'chan' have random values here, which could cause a buffer
overflow in debug builds, if chan > 4.
José Fonseca [Sun, 17 Oct 2010 16:32:41 +0000 (09:32 -0700)]
gallivm: Fix SoA cubemap derivative computation.
Derivatives are now scalar.
Broken since
17dbd41cf23e7e7de2f27e5e9252d7f792d932f3.
José Fonseca [Sun, 17 Oct 2010 14:45:08 +0000 (07:45 -0700)]
llvmpipe: Ensure z_shift and z_width is initialized.
José Fonseca [Sun, 17 Oct 2010 14:15:58 +0000 (07:15 -0700)]
llvmpipe: Fix depth-stencil regression.
If stencil is enabled then we need to load the z_dst, even if depth
testing is disabled.
This fixes reflect mesa demo.
Dave Airlie [Sun, 17 Oct 2010 06:45:15 +0000 (16:45 +1000)]
r600g: add evergreen ARL support.
Thanks to Alex Deucher for pointing out the FLT to int conversion is necessary
and writing an initial patch, this brings about 20 piglits, and I think this
is the last piece to make evergreen and r600 equal in terms of features.
Brian Paul [Fri, 15 Oct 2010 23:32:23 +0000 (17:32 -0600)]
gallivm: use util_snprintf()
Brian Paul [Fri, 15 Oct 2010 23:24:43 +0000 (17:24 -0600)]
st/mesa: update function name, comments
Brian Paul [Fri, 15 Oct 2010 23:18:39 +0000 (17:18 -0600)]
st/mesa: use GLuint to avoid problem w/ uint not defined on mingw32
Brian Paul [Fri, 15 Oct 2010 23:01:56 +0000 (17:01 -0600)]
st/mesa: reformatting in st_cb_drawpixels.c
Brian Paul [Fri, 15 Oct 2010 22:54:03 +0000 (16:54 -0600)]
st/mesa: fix regressions in glDrawPixels(GL_STENCIL_INDEX)
We need to keep track of three different fragment shaders: Z-only, stencil-
only, and Z+stencil. Before, we were only keeping track of the first one
we encountered.
Brian Paul [Fri, 15 Oct 2010 21:44:01 +0000 (15:44 -0600)]
glsl: add ir_unop_round_even case to silence unhandled enum warning
Brian Paul [Fri, 15 Oct 2010 17:55:21 +0000 (11:55 -0600)]
gallivm: added lp_build_load_volatile()
There's no LLVM C LLVMBuildLoadVolatile() function so roll our own.
Not used anywhere at this time but can come in handy during debugging.
Brian Paul [Fri, 15 Oct 2010 14:41:31 +0000 (08:41 -0600)]
gallivm: added lp_build_print_vec4()
Eric Anholt [Fri, 15 Oct 2010 19:04:52 +0000 (12:04 -0700)]
i965: Set the type of the null register to fix gen6 FS comparisons.
We often use reg_null as the destination when setting up the flag
regs. However, on gen6 there aren't general implicit conversions to
destination types from src types, so the comparison to produce the
flag regs would be done on the integer result interpreted as a float.
Hilarity ensued.
Fixes 20 piglit cases.
Ian Romanick [Fri, 15 Oct 2010 17:32:02 +0000 (10:32 -0700)]
i965: Fix indentation after commit
3322fbaf
Ian Romanick [Fri, 15 Oct 2010 00:55:17 +0000 (17:55 -0700)]
linker: Trivial indention fix
Jakob Bornecrantz [Fri, 15 Oct 2010 14:46:10 +0000 (15:46 +0100)]
target-helpers: Remove per target software wrapper check
Instead of having a NAME_SOFTWARE check just use the GALLIUM_DRIVER
instead but set the default to native which is the same as not wrapped.
Jakob Bornecrantz [Fri, 15 Oct 2010 14:58:54 +0000 (15:58 +0100)]
egl: Remove unnecessary headers
Jakob Bornecrantz [Fri, 15 Oct 2010 14:57:55 +0000 (15:57 +0100)]
wrapper: Add a way to dewrap a pipe screen without destroying it
Jakob Bornecrantz [Fri, 15 Oct 2010 14:38:29 +0000 (15:38 +0100)]
wrapper: Fix spelling
Jakob Bornecrantz [Tue, 12 Oct 2010 17:41:24 +0000 (18:41 +0100)]
llvmpipe: Move makefile include to before targets
Or plain make inside of the directory wont build libllvmpipe.a
Xavier Chantry [Fri, 15 Oct 2010 13:53:13 +0000 (15:53 +0200)]
nv50: apply layout_mask to tile_flags
The tile_flags now store more than just nv50 page table entry bits.
Keith Whitwell [Fri, 15 Oct 2010 12:23:30 +0000 (13:23 +0100)]
llvmpipe: validate color outputs against key->nr_cbufs
Keith Whitwell [Fri, 15 Oct 2010 12:23:05 +0000 (13:23 +0100)]
llvmpipe: check shader outputs are non-null before using
Vinson Lee [Fri, 15 Oct 2010 13:12:26 +0000 (06:12 -0700)]
mesa: Add missing header to shaderobj.h.
Include compiler.h for ASSERT symbol.
Keith Whitwell [Fri, 15 Oct 2010 13:11:22 +0000 (14:11 +0100)]
llvmpipe: fix non-sse build after recent changes
Keith Whitwell [Fri, 15 Oct 2010 12:52:00 +0000 (13:52 +0100)]
llvmpipe: use aligned loads/stores for plane values
Keith Whitwell [Tue, 12 Oct 2010 17:59:15 +0000 (18:59 +0100)]
llvmpipe: do plane calculations with intrinsics
This is a step towards moving this code into the rasterizer.
Keith Whitwell [Tue, 12 Oct 2010 17:58:05 +0000 (18:58 +0100)]
gallium: move some intrinsics helpers to u_sse.h
Keith Whitwell [Fri, 15 Oct 2010 12:04:19 +0000 (13:04 +0100)]
llvmpipe: don't store plane.ei value in binned data
Further reduce the size of a binned triangle.
Keith Whitwell [Fri, 15 Oct 2010 11:23:22 +0000 (12:23 +0100)]
llvmpipe: slightly shrink the size of a binned triangle
Keith Whitwell [Thu, 14 Oct 2010 23:12:19 +0000 (00:12 +0100)]
llvmpipe: don't pass frontfacing as a float
Keith Whitwell [Thu, 14 Oct 2010 22:28:10 +0000 (23:28 +0100)]
llvmpipe: reintroduce SET_STATE binner command
But bin lazily only into bins which are receiving geometry.
Chad Versace [Wed, 13 Oct 2010 15:29:58 +0000 (08:29 -0700)]
glsl: Fix ir validation for bit logic ops
In ir_validate::visit_leave(), the cases for
- ir_binop_bit_and
- ir_binop_bit_xor
- ir_binop_bit_or
were incorrect. It was incorrectly asserted that both operands must be the
same type, when in fact one may be scalar and the other a vector. It was also
incorrectly asserted that the resultant type was the type of the left operand,
which in fact does not hold when the left operand is a scalar and the right
operand is a vector.
Chad Versace [Sun, 10 Oct 2010 04:27:41 +0000 (21:27 -0700)]
glsl: Implement constant expr evaluation for bitwise logic ops
Implement by adding the following cases to
ir_exporession::constant_expression_value():
- ir_binop_bit_and
- ir_binop_bit_or
- ir_binop_bit_xor
Chad Versace [Sun, 10 Oct 2010 03:56:14 +0000 (20:56 -0700)]
glsl: Implement constant expr evaluation for bit-shift ops
Implement by adding the following cases to
ir_expression::constant_expression_value():
- ir_binop_lshfit
- ir_binop_rshfit
Chad Versace [Sat, 9 Oct 2010 00:28:34 +0000 (17:28 -0700)]
glsl: Implement constant expr evaluation for bitwise-not
Implement by adding a case to ir_expression::constant_expression_value()
for ir_unop_bit_not.
Chad Versace [Fri, 8 Oct 2010 23:22:28 +0000 (16:22 -0700)]
glsl: Implement ast-to-hir for binary shifts in GLSL 1.30
Implement by adding the following cases to ast_expression::hir():
- ast_lshift
- ast_rshift
Also, implement ir validation for the new operators by adding the following
cases to ir_validate::visit_leave():
- ir_binop_lshift
- ir_binop_rshift
Chad Versace [Fri, 8 Oct 2010 23:12:56 +0000 (16:12 -0700)]
glsl: Change generated file glsl_lexer.cpp
Chad Versace [Fri, 8 Oct 2010 23:12:24 +0000 (16:12 -0700)]
glsl: Add lexer rules for << and >> in GLSL 1.30
Commit for generated file glsl_lexer.cpp follows this commit.
Dave Airlie [Thu, 14 Oct 2010 04:40:51 +0000 (14:40 +1000)]
r600g: evergreen interpolation support.
On evergreen, interpolation has moved into the fragment shader,
with the interpolation parmaters being passed via GPRs and LDS entries.
This works out the number of interps required and reserves GPR/LDS
storage for them, it also correctly routes face/position values which
aren't interpolated from the vertex shader.
Also if we noticed nothing is to be interpolated we always setup perspective
interpolation for one value otherwise the GPU appears to lockup.
This fixes about 15 piglit tests on evergreen.
Dave Airlie [Thu, 14 Oct 2010 04:40:24 +0000 (14:40 +1000)]
tgsi: add scanner support for centroid inputs
Ian Romanick [Thu, 14 Oct 2010 20:28:42 +0000 (13:28 -0700)]
glsl: Slightly change the semantic of _LinkedShaders
Previously _LinkedShaders was a compact array of the linked shaders
for each shader stage. Now it is arranged such that each slot,
indexed by the MESA_SHADER_* defines, refers to a specific shader
stage. As a result, some slots will be NULL. This makes things a
little more complex in the linker, but it simplifies things in other
places.
As a side effect _NumLinkedShaders is removed.
NOTE: This may be a candidate for the 7.9 branch. If there are other
patches that get backported to 7.9 that use _LinkedShader, this patch
should be cherry picked also.
Eric Anholt [Fri, 15 Oct 2010 00:01:06 +0000 (17:01 -0700)]
i965: Fix texturing on pre-gen5.
I broke it in
06fd639c519214b6ebcbf29127b6d9ed429f8641 by only testing
2 generations of hardware :(
Brian Paul [Thu, 14 Oct 2010 22:31:54 +0000 (16:31 -0600)]
llvmpipe: code to dump bytecode to file (disabled)
Brian Paul [Thu, 14 Oct 2010 22:21:32 +0000 (16:21 -0600)]
gallivm: add compile-time option to emit inst addrs and/or line numbers
Disabling address printing is helpful for diffing.
Brian Paul [Thu, 14 Oct 2010 20:03:46 +0000 (14:03 -0600)]
mesa: remove post-convolution width/height vars
These were left-over bits from when convolution was removed.
Kenneth Graunke [Thu, 14 Oct 2010 20:41:29 +0000 (13:41 -0700)]
glsl: Refresh autogenerated file builtin_function.cpp.
Kenneth Graunke [Thu, 14 Oct 2010 21:33:30 +0000 (14:33 -0700)]
glsl: Add support for the 1.30 round() built-in.
This implements round() via the ir_unop_round_even opcode, rather than
adding a new opcode. We may wish to add one in the future, since it
might enable a small performance increase on some hardware, but for now,
this should suffice.
Kenneth Graunke [Thu, 14 Oct 2010 21:31:54 +0000 (14:31 -0700)]
i965: Add support for ir_unop_round_even via the RNDE instruction.
Kenneth Graunke [Thu, 14 Oct 2010 20:40:26 +0000 (13:40 -0700)]
glsl: Add front-end support for GLSL 1.30's roundEven built-in.
Implemented using the op-code introduced in the previous commit.
Kenneth Graunke [Thu, 14 Oct 2010 20:37:03 +0000 (13:37 -0700)]
glsl: Add a new ir_unop_round_even opcode for GLSL 1.30's roundEven.
Also, update ir_to_mesa's "1.30 is unsupported" case to "handle" it.
Dave Airlie [Thu, 14 Oct 2010 22:46:16 +0000 (08:46 +1000)]
r300g: clean up warning due to unknown cap.
Keith Whitwell [Thu, 14 Oct 2010 16:19:00 +0000 (17:19 +0100)]
r600g: handle absolute modifier in shader translator
This was being classed as unsupported in one place but used in others.
Enabling it seems to work fine.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Keith Whitwell [Thu, 14 Oct 2010 15:42:39 +0000 (16:42 +0100)]
r600g: emit hardware linewidth
Tested with demos/pixeltest - line rasterization doesn't seem to be
set up for GL conventions yet, but at least width is respected now.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Keith Whitwell [Thu, 14 Oct 2010 15:42:38 +0000 (16:42 +0100)]
r600/drm: fix segfaults in winsys create failure path
Would try to destroy radeon->cman, radeon->kman both which were still
NULL.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Kenneth Graunke [Thu, 14 Oct 2010 20:19:23 +0000 (13:19 -0700)]
i965: Clean up a warning in the old fragment backend.
Hopefully this code can just go away soon.
Eric Anholt [Thu, 14 Oct 2010 19:23:29 +0000 (12:23 -0700)]
i965: Enable the new FS backend on pre-gen6 as well.
It is now to the point where we have no regressing piglit tests. It
also fixes Yo Frankie! and Humus DynamicBranching, probably due to the
piglit bias tests that work that didn't on the Mesa IR backend.
As a downside, performance takes about a 5-10% performance hit at the
moment (e.g. nexuiz 19.8fps -> 18.8fps), which I plan to resolve by
reintroducing 16-wide fragment shaders where possible. It is a win,
though, for fragment shaders using flow control.
Kenneth Graunke [Thu, 14 Oct 2010 18:40:19 +0000 (11:40 -0700)]
i965: Correctly emit the RNDZ instruction.
Simply using RNDU, RNDZ, or RNDE does not produce the desired result.
Rather, the RND* instructions place a value in the destination register
that may be 1 less than the correct answer. They can also set per-channel
"increment bits" in a flag register, which, if set, mean dest needs to
be incremented by 1. A second instruction - a predicated add -
completes the job.
Notably, RNDD always produces the correct answer in a single
instruction.
Fixes piglit test glsl-fs-trunc.
Kenneth Graunke [Thu, 14 Oct 2010 18:39:09 +0000 (11:39 -0700)]
i965: Use RNDZ for ir_unop_trunc in the new FS.
The existing code used RNDD, which rounds down, rather than toward zero.
Kenneth Graunke [Thu, 14 Oct 2010 17:51:09 +0000 (10:51 -0700)]
glsl: Refresh autogenerated file builtin_function.cpp.
Kenneth Graunke [Thu, 14 Oct 2010 17:49:13 +0000 (10:49 -0700)]
glsl: Add front-end support for the "trunc" built-in.
Kenneth Graunke [Wed, 13 Oct 2010 23:35:34 +0000 (16:35 -0700)]
i965: Use logical-not when emitting ir_unop_ceil.
Fixes piglit test glsl-fs-ceil.
Eric Anholt [Thu, 14 Oct 2010 18:27:17 +0000 (11:27 -0700)]
i965: Add peepholing of conditional mod generation from expressions.
This cuts usually 2 out of 3 instructions for flag reg generation (if
statements, conditional assignment) by producing the conditional mod
in the expression representing the boolean value.
Fixes glsl-fs-vec4-indexing-temp-dst-in-nested-loop-combined (register
allocation no longer fails for the conditional generation
proliferation)
Eric Anholt [Thu, 14 Oct 2010 18:11:29 +0000 (11:11 -0700)]
i965: Add a function for handling the move of boolean values to flag regs.
This will be a place to peephole comparisions directly to the flag
regs, and for now avoids using MOV with conditional mod on gen6, which
is now illegal.
Kristian Høgsberg [Thu, 14 Oct 2010 18:57:47 +0000 (14:57 -0400)]
Only install vtxfmt tables for OpenGL
GLES1 and GLES2 install their own exec pointers and don't need the
Save table. Also, the SET_* macros use different indices for the different
APIs so the offsets used in vtxfmt.c are actually wrong for the ES APIs.
Eric Anholt [Thu, 14 Oct 2010 03:17:15 +0000 (20:17 -0700)]
i965: Add a pass to the FS to split virtual GRFs to float channels.
Improves nexuiz performance 0.91% (+/- 0.54%, n=8)
Eric Anholt [Thu, 14 Oct 2010 05:39:06 +0000 (22:39 -0700)]
i965: Update the live interval when coalescing regs.