OSDN Git Service
José Fonseca [Sat, 9 Oct 2010 08:34:31 +0000 (09:34 +0100)]
gallivm: Do size computations simultanously for all dimensions (AoS).
Operate simultanouesly on <width, height, depth> vector as much as possible,
instead of doing the operations on vectors with broadcasted scalars.
Also do the 24.8 fixed point scalar with integer shift of the texture size,
for unnormalized coordinates.
AoS path only for now -- the same thing can be done for SoA.
Zack Rusin [Thu, 7 Oct 2010 20:26:17 +0000 (16:26 -0400)]
llvmpipe: fix rasterization of vertical lines on pixel boundaries
Vinson Lee [Fri, 8 Oct 2010 23:40:29 +0000 (16:40 -0700)]
i965: Initialize member variables.
Fixes these GCC warnings.
brw_wm_fp.c: In function 'search_or_add_const4f':
brw_wm_fp.c:92: warning: 'reg.Index2' is used uninitialized in this function
brw_wm_fp.c:84: note: 'reg.Index2' was declared here
brw_wm_fp.c:92: warning: 'reg.RelAddr2' is used uninitialized in this function
brw_wm_fp.c:84: note: 'reg.RelAddr2' was declared here
Vinson Lee [Fri, 8 Oct 2010 23:30:59 +0000 (16:30 -0700)]
i965: Silence unused variable warning on non-debug builds.
Fixes this GCC warning.
brw_vs.c: In function 'do_vs_prog':
brw_vs.c:46: warning: unused variable 'ctx'
Vinson Lee [Fri, 8 Oct 2010 23:02:59 +0000 (16:02 -0700)]
i965: Silence unused variable warning on non-debug builds.
Fixes this GCC warning.
brw_eu_emit.c: In function 'brw_math2':
brw_eu_emit.c:1189: warning: unused variable 'intel'
Vinson Lee [Fri, 8 Oct 2010 22:49:02 +0000 (15:49 -0700)]
i915: Silence unused variable warning in non-debug builds.
Fixes this GCC warning.
i915_vtbl.c: In function 'i915_assert_not_dirty':
i915_vtbl.c:670: warning: unused variable 'dirty'
Roland Scheidegger [Fri, 8 Oct 2010 22:35:58 +0000 (00:35 +0200)]
gallivm: make use of new iround code in lp_bld_conv.
Only requires sse2 now.
Roland Scheidegger [Fri, 8 Oct 2010 22:14:11 +0000 (00:14 +0200)]
gallivm: optimize soa linear clamp to edge wrap mode a bit
Clamp against 0 instead of -0.5, which simplifies things.
The former version would have resulted in both int coords being zero
(in case of coord being smaller than 0) and some "unused" weight value,
whereas now the int coords will be 0 and 1, but weight will be 0, hence the
lerp should produce the same value.
Still not happy about differences between normalized and non-normalized...
Roland Scheidegger [Fri, 8 Oct 2010 19:08:49 +0000 (21:08 +0200)]
gallivm: avoid unnecessary URem in linear wrap repeat case
Haven't looked at what code this exactly generates but URem can't be fast.
Instead of using two URem only use one and replace the second one with
select/add (this is what the corresponding aos code already does).
Roland Scheidegger [Fri, 8 Oct 2010 19:06:04 +0000 (21:06 +0200)]
gallivm: more linear tex wrap mode calculation simplification
Rearrange order of operations a bit to make some clamps easier.
All calculations should be equivalent.
Note there seems to be some inconsistency in the clamp to edge case
wrt normalized/non-normalized coords, could potentially simplify this too.
Roland Scheidegger [Fri, 8 Oct 2010 18:57:50 +0000 (20:57 +0200)]
gallivm: optimize some tex wrap mode calculations a bit
Sometimes coords are clamped to positive numbers before doing conversion
to int, or clamped to 0 afterwards, in this case can use itrunc
instead of ifloor which is easier. This is only the case for nearest
calculations unfortunately, except linear MIRROR_CLAMP_TO_EDGE which
for the same reason can use a unsigned float build context so the
ifloor_fract helper can reduce this to itrunc in the ifloor helper itself.
Roland Scheidegger [Fri, 8 Oct 2010 16:43:49 +0000 (18:43 +0200)]
gallivm: replace sub/floor/ifloor combo with ifloor_fract
Roland Scheidegger [Fri, 8 Oct 2010 16:38:25 +0000 (18:38 +0200)]
gallivm: faster iround implementation for sse2
sse2 supports round to nearest directly (or rather, assuming default nearest
rounding mode in MXCSR). Use intrinsic to use this rather than round (sse41)
or bit manipulation whenever possible.
Roland Scheidegger [Fri, 8 Oct 2010 16:31:38 +0000 (18:31 +0200)]
gallivm: fix trunc/itrunc comment
trunc of -1.5 is -1.0 not 1.0...
Vinson Lee [Fri, 8 Oct 2010 22:33:44 +0000 (15:33 -0700)]
i915: Silence unused variable warning in non-debug builds.
Fixes this GCC warning.
i830_vtbl.c: In function 'i830_assert_not_dirty':
i830_vtbl.c:704: warning: unused variable 'i830'
Ian Romanick [Fri, 8 Oct 2010 21:55:27 +0000 (14:55 -0700)]
docs: Update status of GL 3.x related extensions
Ian Romanick [Fri, 8 Oct 2010 21:50:34 +0000 (14:50 -0700)]
docs: skeleton for 7.10 release notes
Ian Romanick [Fri, 8 Oct 2010 21:29:11 +0000 (14:29 -0700)]
glsl: Remove const decoration from inlined function parameters
The constness of the function parameter gets inlined with the rest of
the function. However, there is also an assignment to the parameter.
If this occurs inside a loop the loop analysis code will get confused
by the assignment to a read-only variable.
Fixes bugzilla #30552.
NOTE: this is a candidate for the 7.9 branch.
Ian Romanick [Thu, 7 Oct 2010 22:15:44 +0000 (15:15 -0700)]
intel: Enable GL_ARB_explicit_attrib_location
Ian Romanick [Tue, 5 Oct 2010 23:01:17 +0000 (16:01 -0700)]
main: Enable GL_ARB_explicit_attrib_location for swrast
Ian Romanick [Fri, 8 Oct 2010 00:21:22 +0000 (17:21 -0700)]
glsl: Add linker support for explicit attribute locations
Ian Romanick [Thu, 7 Oct 2010 22:13:38 +0000 (15:13 -0700)]
glsl: Track explicit location in AST to IR translation
Ian Romanick [Wed, 6 Oct 2010 00:03:25 +0000 (17:03 -0700)]
glsl: Regenerate files changes by previous commit
Ian Romanick [Wed, 6 Oct 2010 00:00:31 +0000 (17:00 -0700)]
glsl: Add parser support for GL_ARB_explicit_attrib_location layouts
Only layout(location=#) is supported. Setting the index requires GLSL
1.30 and GL_ARB_blend_func_extended.
Ian Romanick [Tue, 5 Oct 2010 23:03:12 +0000 (16:03 -0700)]
glcpp: Regenerate files changes by previous commit
Ian Romanick [Tue, 5 Oct 2010 23:02:38 +0000 (16:02 -0700)]
glcpp: Add the define for ARB_explicit_attrib_location when present
Ian Romanick [Tue, 5 Oct 2010 23:40:00 +0000 (16:40 -0700)]
glsl: Regenerate files modified by previous commits
Ian Romanick [Tue, 5 Oct 2010 23:38:47 +0000 (16:38 -0700)]
glsl: Wrap ast_type_qualifier contents in a struct in a union
This will ease adding non-bit fields in the near future.
Ian Romanick [Tue, 5 Oct 2010 23:23:32 +0000 (16:23 -0700)]
glsl: Clear type_qualifier using memset
Ian Romanick [Tue, 5 Oct 2010 23:18:56 +0000 (16:18 -0700)]
glsl: Slight refactor of error / warning checking for ARB_fcc layout
Ian Romanick [Tue, 5 Oct 2010 23:14:18 +0000 (16:14 -0700)]
glsl: Refactor 'layout' grammar to match GLSL 1.60 spec grammar
Ian Romanick [Fri, 8 Oct 2010 00:20:15 +0000 (17:20 -0700)]
glsl: Fail linking if assign_attribute_locations fails
Vinson Lee [Fri, 8 Oct 2010 21:17:14 +0000 (14:17 -0700)]
r600g: Silence uninitialized variable warning.
Vinson Lee [Fri, 8 Oct 2010 21:14:16 +0000 (14:14 -0700)]
r600g: Silence uninitialized variable warning.
Vinson Lee [Fri, 8 Oct 2010 21:08:50 +0000 (14:08 -0700)]
r600g: Silence uninitialized variable warning.
Vinson Lee [Fri, 8 Oct 2010 21:03:10 +0000 (14:03 -0700)]
gallivm: Remove unnecessary header.
Eric Anholt [Tue, 5 Oct 2010 17:29:42 +0000 (10:29 -0700)]
i965: Add register coalescing to the new FS backend.
Improves performance of my GLSL demo 14.3% (+/- 4%, n=4) by
eliminating the moves used in ir_assignment and ir_swizzle handling.
Still 16.5% to go to catch up to the Mesa IR backend, presumably
because instructions are almost perfectly mis-scheduled now.
Eric Anholt [Fri, 8 Oct 2010 18:16:16 +0000 (11:16 -0700)]
i965: Enable attribute swizzling (repositioning) in the gen6 SF.
We were trying to remap a fully-filled array down to only handing the
WM the components it uses. This is called attribute swizzling, and if
you don't enable it you just get 1:1 mappings of inputs to outputs.
This almost fixes glsl-routing, except for the highest gl_TexCoord[]
indices.
Eric Anholt [Fri, 8 Oct 2010 18:14:48 +0000 (11:14 -0700)]
i965: Fix new FS gen6 interpolation for sparsely-populated arrays.
We'd overwrite the same element twice.
Eric Anholt [Fri, 8 Oct 2010 18:33:40 +0000 (11:33 -0700)]
i965: Fix gen6 WM push constants updates.
We would compute a new buffer, but never point the hardware at the new
buffer. This partially fixes glsl-routing, as now it get the updated
uniform for which attribute to draw.
José Fonseca [Fri, 8 Oct 2010 18:48:16 +0000 (19:48 +0100)]
gallivm: Help for combined extraction and broadcasting.
Doesn't change generated code quality, but saves some typing.
José Fonseca [Fri, 8 Oct 2010 18:11:32 +0000 (19:11 +0100)]
llvmpipe: First minify the texture size, then broadcast.
José Fonseca [Fri, 8 Oct 2010 17:24:54 +0000 (18:24 +0100)]
gallivm: Move into the as much of the second level code as possible.
Also, pass more stuff trhough the sample build context, instead of
arguments.
Eric Anholt [Fri, 8 Oct 2010 05:37:36 +0000 (22:37 -0700)]
i965: Handle swizzles in the addition of YUV texture constants.
If someone happened to land a set in a different swizzle order, we
would have assertion failed.
Eric Anholt [Fri, 8 Oct 2010 05:39:41 +0000 (22:39 -0700)]
i965: Drop the check for YUV constants in the param list.
_mesa_add_unnamed_constant() already does that.
Eric Anholt [Fri, 8 Oct 2010 05:25:35 +0000 (22:25 -0700)]
i965: Drop the check for duplicate _mesa_add_state_reference.
_mesa_add_state_reference does that check for us anyway.
Eric Anholt [Fri, 8 Oct 2010 05:24:38 +0000 (22:24 -0700)]
mesa: Simplify a bit of _mesa_add_state_reference using memcmp.
José Fonseca [Fri, 8 Oct 2010 16:37:18 +0000 (17:37 +0100)]
gallivm: Warn when doing inefficient integer comparisons.
José Fonseca [Fri, 8 Oct 2010 15:56:45 +0000 (16:56 +0100)]
gallivm: Avoid control flow for two-sided stencil test.
Keith Whitwell [Tue, 5 Oct 2010 15:50:22 +0000 (16:50 +0100)]
llvmpipe: fix off-by-one in tri_16
Keith Whitwell [Fri, 8 Oct 2010 16:21:03 +0000 (17:21 +0100)]
llvmpipe: add rast_tri_4_16 for small lines and points
Keith Whitwell [Thu, 23 Sep 2010 18:56:48 +0000 (19:56 +0100)]
llvmpipe: clean up setup_tri a little
Keith Whitwell [Wed, 6 Oct 2010 10:48:10 +0000 (11:48 +0100)]
gallivm: round rather than truncate in new 4x4f->1x16ub conversion path
José Fonseca [Mon, 4 Oct 2010 16:42:18 +0000 (17:42 +0100)]
gallivm: Use the wrappers for SSE pack intrinsics.
Fixes assertion failures on LLVM 2.6.
Keith Whitwell [Mon, 4 Oct 2010 14:00:34 +0000 (15:00 +0100)]
gallivm: special case conversion 4x4f to 1x16ub
Nice reduction in the number of operations required for final color
output in many shaders.
Keith Whitwell [Fri, 8 Oct 2010 16:06:05 +0000 (17:06 +0100)]
llvmpipe: avoid overflow in triangle culling
Avoid multiplying fixed-point values. Calculate triangle area in
floating point use that for culling.
Lift area calculations up a level as we are already doing this in the
triangle_both() case.
Would like to share the calculated area with attribute interpolation,
but the way the code is structured makes this difficult.
Keith Whitwell [Fri, 8 Oct 2010 16:01:16 +0000 (17:01 +0100)]
llvmpipe: fail gracefully on oom in scene creation
José Fonseca [Fri, 8 Oct 2010 14:50:28 +0000 (15:50 +0100)]
gallivm: Implement brilinear filtering.
José Fonseca [Fri, 8 Oct 2010 13:09:22 +0000 (14:09 +0100)]
gallivm: Fix copy'n'paste typo in previous commit.
José Fonseca [Fri, 8 Oct 2010 13:05:50 +0000 (14:05 +0100)]
gallivm: Clamp mipmap level and zero mip weight simultaneously.
José Fonseca [Fri, 8 Oct 2010 12:36:18 +0000 (13:36 +0100)]
gallivm: Use lp_build_ifloor_fract for lod computation.
Forgot this one before.
José Fonseca [Fri, 8 Oct 2010 12:26:37 +0000 (13:26 +0100)]
gallivm: Don't compute the second mipmap level when frac(lod) == 0
José Fonseca [Fri, 8 Oct 2010 12:24:39 +0000 (13:24 +0100)]
gallivm: Simplify lp_build_mipmap_level_sizes' interface.
José Fonseca [Fri, 8 Oct 2010 09:54:23 +0000 (10:54 +0100)]
gallivm: Do not do mipfiltering when magnifying.
If lod < 0, then invariably follows that ilevel0 == ilevel1 == 0.
Vinson Lee [Fri, 8 Oct 2010 11:56:49 +0000 (04:56 -0700)]
r600g: Remove unnecessary header.
Dave Airlie [Fri, 8 Oct 2010 09:55:05 +0000 (19:55 +1000)]
r600g: drop width/height per level storage.
these aren't used anywhere, so just waste memory.
Eric Anholt [Wed, 6 Oct 2010 05:30:42 +0000 (22:30 -0700)]
i965: Normalize cubemap coordinates like is done in the Mesa IR path.
Fixes glsl-fs-texturecube-2-*
Eric Anholt [Thu, 7 Oct 2010 16:13:09 +0000 (09:13 -0700)]
i965: Disable emitting if () statements on gen6 until we really fix them.
Dave Airlie [Thu, 7 Oct 2010 23:35:17 +0000 (09:35 +1000)]
r600g: add some RG texture format support.
Kristian Høgsberg [Thu, 7 Oct 2010 21:03:53 +0000 (17:03 -0400)]
gles2: Add GL_EXT_texture_format_BGRA8888 support
José Fonseca [Thu, 7 Oct 2010 21:03:59 +0000 (22:03 +0100)]
gallivm: Vectorize the rho computation.
Dave Airlie [Thu, 7 Oct 2010 05:32:05 +0000 (15:32 +1000)]
r600g: fix Z export enable bits.
we should be checking output array not input to decide.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Dave Airlie [Thu, 7 Oct 2010 05:13:09 +0000 (15:13 +1000)]
r600g: use format from the sampler view not from the texture.
we want to use the format from the sampler view which isn't always the
same as the texture format when creating sampler views.
Andre Maasikas [Wed, 6 Oct 2010 18:14:15 +0000 (21:14 +0300)]
r600g: fix evergreen interpolation setup
interp data is stored in gpr0 so first interp overwrote it
and subsequent ones got wrong values
reserve register 0 so it's not used for attribs.
alternative is to interpolate attrib0 last (reverse, as r600c does)
Chia-I Wu [Thu, 7 Oct 2010 04:14:38 +0000 (12:14 +0800)]
st/vega: Fix version check in context creation.
This fixes a regression since
4531356817ec8383ac35932903773de67af92e37.
Chia-I Wu [Thu, 7 Oct 2010 04:06:07 +0000 (12:06 +0800)]
targets/egl: Fix linking with libdrm.
Eric Anholt [Thu, 7 Oct 2010 00:29:29 +0000 (17:29 -0700)]
i965: Fix gen6 pointsize handling to match pre-gen6.
Fixes point-line-no-cull.
Bug #30532
Eric Anholt [Wed, 6 Oct 2010 19:10:31 +0000 (12:10 -0700)]
i965: Don't assume that WPOS is always provided on gen6 in the new FS.
We sensibly only provide it if the FS asks for it. We could actually
skip WPOS unless the FS needed WPOS.zw, but that's something for
later.
Fixes: glsl-texture2d and probably many others.
Eric Anholt [Wed, 6 Oct 2010 18:19:48 +0000 (11:19 -0700)]
i965: Add support for gl_FrontFacing on gen6.
Fixes glsl1-gl_FrontFacing var (2) with new FS.
Eric Anholt [Wed, 6 Oct 2010 18:13:22 +0000 (11:13 -0700)]
i965: Refactor gl_FrontFacing setup out of general variable setup.
Eric Anholt [Wed, 6 Oct 2010 18:04:02 +0000 (11:04 -0700)]
i965: Gen6's sampler messages are the same as Ironlake.
This should fix texturing in the new FS backend.
Eric Anholt [Wed, 6 Oct 2010 18:00:31 +0000 (11:00 -0700)]
i965: Don't do 1/w multiplication in new FS for gen6
Not needed now that we're doing barycentric.
Eric Anholt [Wed, 6 Oct 2010 17:22:22 +0000 (10:22 -0700)]
i965: Add some clarification of the WECtrl field.
Eric Anholt [Wed, 6 Oct 2010 18:25:05 +0000 (11:25 -0700)]
i965: Fix botch in the header_present case in the new FS.
I only set it on the color_regions == 0 case, missing the important
case, causing GPU hangs on pre-gen6.
José Fonseca [Wed, 6 Oct 2010 09:11:15 +0000 (10:11 +0100)]
llvmpipe: Cleanup depth-stencil clears.
Only cosmetic changes. No actual practical difference.
José Fonseca [Wed, 6 Oct 2010 09:09:37 +0000 (10:09 +0100)]
util: Cleanup util_pack_z_stencil and friends.
- Handle PIPE_FORMAT_Z32_FLOAT packing correctly.
- In the integer version z shouldn't be passed as as double.
- Make it clear that the integer versions should only be used for masks.
- Make integer type sizes explicit (uint32_t for now, although
uint64_t will be necessary later to encode f32_s8_x24).
José Fonseca [Wed, 6 Oct 2010 17:44:51 +0000 (18:44 +0100)]
gallivm: Compute lod as integer whenever possible.
More accurate/faster results for PIPE_TEX_MIPFILTER_NEAREST. Less
FP <-> SI conversion overall.
José Fonseca [Wed, 6 Oct 2010 13:53:19 +0000 (14:53 +0100)]
gallivm: Only apply min/max_lod when necessary.
Keith Whitwell [Thu, 30 Sep 2010 15:43:56 +0000 (16:43 +0100)]
gallivm: don't apply zero lod_bias
José Fonseca [Wed, 6 Oct 2010 17:31:36 +0000 (18:31 +0100)]
gallivm: Combined ifloor & fract helper.
The only way to ensure we don't do redundant FP <-> SI conversions.
José Fonseca [Wed, 6 Oct 2010 16:44:05 +0000 (17:44 +0100)]
gallivm: Fast implementation of iround(log2(x))
Not tested yet, but should be correct.
José Fonseca [Wed, 6 Oct 2010 13:06:14 +0000 (14:06 +0100)]
gallivm: Use a faster (and less accurate) log2 in lod computation.
José Fonseca [Wed, 6 Oct 2010 11:09:32 +0000 (12:09 +0100)]
gallivm: Take the type signedness in consideration in round/ceil/floor.
Eric Anholt [Mon, 4 Oct 2010 22:08:03 +0000 (15:08 -0700)]
i965: Fix up IF/ELSE/ENDIF for gen6.
The jump delta is now in the part of the instruction where the
destination fields used to be, and the src args are ignored (or not,
for the new non-predicated IF that we don't use yet).
Eric Anholt [Mon, 4 Oct 2010 22:09:18 +0000 (15:09 -0700)]
i965: Gen6 no longer has the IFF instruction; always use IF.
Eric Anholt [Wed, 6 Oct 2010 16:57:55 +0000 (09:57 -0700)]
i965: Add back gen6 headerless FB writes to the new FS backend.
It's not that hard to detect when we need the header.
Jerome Glisse [Wed, 6 Oct 2010 16:56:53 +0000 (12:56 -0400)]
r600g: fix dirty state handling
Avoid having object ending up in dead list of dirty object.
Signed-off-by: Jerome Glisse <jglisse@redhat.com>
Eric Anholt [Tue, 5 Oct 2010 17:25:22 +0000 (10:25 -0700)]
i965: Also do constant propagation for the second operand of CMP.
We could do the first operand as well by flipping the comparison, but
this covered several CMPs in code I was looking at.
Eric Anholt [Tue, 5 Oct 2010 17:20:16 +0000 (10:20 -0700)]
i965: Enable the constant propagation code.
A debug disable had slipped in.
Jerome Glisse [Wed, 6 Oct 2010 13:40:27 +0000 (09:40 -0400)]
r600g: avoid segfault due to unintialized list pointer
Signed-off-by: Jerome Glisse <jglisse@redhat.com>