mesa.git
13 years agoi965g: s/varient/variant/
Brian Paul [Thu, 16 Dec 2010 15:47:37 +0000 (08:47 -0700)]
i965g: s/varient/variant/

13 years agoi915g: s/varient/variant/
Brian Paul [Thu, 16 Dec 2010 15:46:35 +0000 (08:46 -0700)]
i915g: s/varient/variant/

13 years agosoftpipe: s/varient/variant
Brian Paul [Thu, 16 Dec 2010 15:44:12 +0000 (08:44 -0700)]
softpipe: s/varient/variant

13 years agost/mesa: s/varient/variant
Brian Paul [Thu, 16 Dec 2010 15:43:21 +0000 (08:43 -0700)]
st/mesa: s/varient/variant

13 years agoi965: Set the alternative floating point mode on gen6 VS and WM.
Eric Anholt [Wed, 15 Dec 2010 23:15:02 +0000 (15:15 -0800)]
i965: Set the alternative floating point mode on gen6 VS and WM.

This matches how we did the math instructions pre-gen6, though it
applies to non-math as well.

Fixes vp1-LIT test 2 (degenerate case: 0 ^ 0 -> 1)

13 years agoi915: Fix INTEL_DEBUG=wm segmentation fault
Shuang He [Wed, 15 Dec 2010 03:16:49 +0000 (11:16 +0800)]
i915: Fix INTEL_DEBUG=wm segmentation fault

The program should be disassembled after it's uploaded

13 years agonvfx: fix fragprog word swapping on big-endian machines
Ben Skeggs [Thu, 16 Dec 2010 01:12:52 +0000 (11:12 +1000)]
nvfx: fix fragprog word swapping on big-endian machines

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
13 years agogallium: properly check for src->dst blit compatibilities
Jerome Glisse [Wed, 15 Dec 2010 20:27:16 +0000 (15:27 -0500)]
gallium: properly check for src->dst blit compatibilities

Spotted by Christoph Bumiller & Jose Fonseca

Signed-off-by: Jerome Glisse <jglisse@redhat.com>
13 years agor600g: fix pow(0, 0) evaluating to NaN
Fredrik Höglund [Wed, 15 Dec 2010 19:00:42 +0000 (20:00 +0100)]
r600g: fix pow(0, 0) evaluating to NaN

We have to use the non-IEEE compliant version of MUL here, since
log2(0) is -inf, and 0 * -inf is NaN in IEEE arithmetic.

candidates for 7.10 branch

13 years agor600g: need to reference upload buffer as the might still live accross flush
Jerome Glisse [Wed, 15 Dec 2010 17:07:09 +0000 (12:07 -0500)]
r600g: need to reference upload buffer as the might still live accross flush

Can't get away from referencing upload buffer as after flush a vertex buffer
using the upload buffer might still be active. Likely need to simplify the
pipe_refence a bit so we don't waste so much cpu time in it.

candidates for 7.10 branch

Signed-off-by: Jerome Glisse <jglisse@redhat.com>
13 years agost/mesa: fix incorrect prev pointer in destroy_program_variants()
Brian Paul [Tue, 14 Dec 2010 21:15:20 +0000 (14:15 -0700)]
st/mesa: fix incorrect prev pointer in destroy_program_variants()

13 years agosoftpipe: do texture swizzle during texture sampling
Brian Paul [Tue, 14 Dec 2010 20:01:00 +0000 (13:01 -0700)]
softpipe: do texture swizzle during texture sampling

Instead of when we read texture tiles.  Now swizzling happens after
the shadow depth compare step.  This fixes the piglit glsl-fs-shadow2d*
tests (except for proj+bias because of a GLSL bug).

13 years agomesa: more program debug code
Brian Paul [Tue, 14 Dec 2010 19:46:01 +0000 (12:46 -0700)]
mesa: more program debug code

13 years agotgsi: document texture opcodes
Brian Paul [Tue, 14 Dec 2010 19:45:36 +0000 (12:45 -0700)]
tgsi: document texture opcodes

13 years agoglsl: new glsl_strtod() wrapper to fix decimal point interpretation
Brian Paul [Mon, 13 Dec 2010 15:41:08 +0000 (08:41 -0700)]
glsl: new glsl_strtod() wrapper to fix decimal point interpretation

We always want to use '.' as the decimal point.

See http://bugs.freedesktop.org/show_bug.cgi?id=24531

NOTE: this is a candidate for the 7.10 branch.

13 years agogallivm: do texture swizzle after shadow compare
Brian Paul [Tue, 14 Dec 2010 17:38:15 +0000 (10:38 -0700)]
gallivm: do texture swizzle after shadow compare

We need to swizzle after the shadow comparison so that the GL_DEPTH_MODE
functionality is handled properly.

This fixes all the piglit glsl-fs-shadow2d*.shader_test cases, except
for glsl-fs-shadow2dproj-bias.shader_test which fails because of a
bug in the GLSL compiler (fd.o 32395).

13 years agost/mesa: rename the varient release functions
Brian Paul [Tue, 14 Dec 2010 15:36:39 +0000 (08:36 -0700)]
st/mesa: rename the varient release functions

13 years agor600g: fix segfault when translating vertex buffer
Jerome Glisse [Tue, 14 Dec 2010 18:50:46 +0000 (13:50 -0500)]
r600g: fix segfault when translating vertex buffer

Note the support for non float vertex draw likely regressed need to
find what we want to do there.

candidates for 7.10 branches

Signed-off-by: Jerome Glisse <jglisse@redhat.com>
13 years agomesa: Clean up header file inclusion in prog_optimize.h.
Vinson Lee [Tue, 14 Dec 2010 08:39:57 +0000 (00:39 -0800)]
mesa: Clean up header file inclusion in prog_optimize.h.

13 years agomesa: Clean up header file inclusion in prog_cache.h.
Vinson Lee [Tue, 14 Dec 2010 08:30:24 +0000 (00:30 -0800)]
mesa: Clean up header file inclusion in prog_cache.h.

13 years agomesa: Clean up header file inclusion in nvvertparse.h.
Vinson Lee [Tue, 14 Dec 2010 08:22:27 +0000 (00:22 -0800)]
mesa: Clean up header file inclusion in nvvertparse.h.

13 years agoi965: Add support for using the BLT ring on gen6.
Eric Anholt [Mon, 13 Dec 2010 19:32:19 +0000 (11:32 -0800)]
i965: Add support for using the BLT ring on gen6.

13 years agoi965: Improve the hacks for ARB_fp scalar^scalar POW on gen6.
Eric Anholt [Mon, 13 Dec 2010 23:18:13 +0000 (15:18 -0800)]
i965: Improve the hacks for ARB_fp scalar^scalar POW on gen6.

This is still awful, but my ability to care about reworking the old
backend so we can just get a temporary value into a POW is awfully low
since the new backend does this all sensibly.

Fixes:
fp1-LIT test 1
fp1-LIT test 3 (case x < 0)
fp1-POW test (exponentiation)
fp-lit-mask

13 years agost/mesa: 80-columns wrapping, whitespace fixes in st_cb_bitmap.c
Brian Paul [Tue, 14 Dec 2010 00:34:07 +0000 (17:34 -0700)]
st/mesa: 80-columns wrapping, whitespace fixes in st_cb_bitmap.c

13 years agost/mesa: add geom program code in destroy_program_variants()
Brian Paul [Tue, 14 Dec 2010 00:29:56 +0000 (17:29 -0700)]
st/mesa: add geom program code in destroy_program_variants()

13 years agost/mesa: program struct comments
Brian Paul [Tue, 14 Dec 2010 00:28:02 +0000 (17:28 -0700)]
st/mesa: program struct comments

13 years agost/mesa: use st_fragment_program() instead of cast
Brian Paul [Tue, 14 Dec 2010 00:25:29 +0000 (17:25 -0700)]
st/mesa: use st_fragment_program() instead of cast

13 years agost/mesa: rename variable
Brian Paul [Tue, 14 Dec 2010 00:25:10 +0000 (17:25 -0700)]
st/mesa: rename variable

13 years agost/mesa: minor re-indenting
Brian Paul [Tue, 14 Dec 2010 00:18:47 +0000 (17:18 -0700)]
st/mesa: minor re-indenting

13 years agost/mesa: make st_delete_program() static
Brian Paul [Tue, 14 Dec 2010 00:16:57 +0000 (17:16 -0700)]
st/mesa: make st_delete_program() static

13 years agost/mesa: add comments, fix formatting in st_cb_program.c
Brian Paul [Tue, 14 Dec 2010 00:16:18 +0000 (17:16 -0700)]
st/mesa: add comments, fix formatting in st_cb_program.c

13 years agoSquashed commit of the following (st-mesa-per-context-shaders branch):
Brian Paul [Tue, 14 Dec 2010 00:20:12 +0000 (17:20 -0700)]
Squashed commit of the following (st-mesa-per-context-shaders branch):

commit 4f106f44a32eaddb6cf3fea6ba5ee9787bff609a
Author: Brian Paul <brianp@vmware.com>
Date:   Mon Dec 13 14:06:08 2010 -0700

    st/mesa: reorganize vertex program translation code

    Now it looks like the fragment and geometry program code.
    Also remove the serial number fields from programs.  It was used to
    determine when new translations were needed.  Now the variant key is
    used for that.  And the st_program_string_notify() callback removes all
    variants when the program's code is changed.

commit e12d6791c5e4bff60bb2e6c04414b1b4d1325f3e
Author: Brian Paul <brianp@vmware.com>
Date:   Mon Dec 13 13:38:12 2010 -0700

    st/mesa: implement geometry shader varients

    Only needed in order to support per-context gallium shaders.

commit c5751c673644808ab069259a852f24c4c0e92b9d
Author: Brian Paul <brianp@vmware.com>
Date:   Sun Dec 12 15:28:57 2010 -0700

    st/mesa: restore glDraw/CopyPixels using new fragment program variants

    Clean up the logic for fragment programs for glDraw/CopyPixels.  We now
    generate fragment program variants for glDraw/CopyPixels as needed which
    do texture sampling, pixel scale/bias, pixelmap lookups, etc.

commit 7b0bb99bab6547f503a0176b5c0aef1482b02c97
Author: Brian Paul <brianp@vmware.com>
Date:   Fri Dec 10 17:03:23 2010 -0700

    st/mesa: checkpoint: implement fragment program variants

    The fragment programs variants are per-context, as the vertex programs.

    NOTE: glDrawPixels is totally broken at this point.

commit 2cc926183f957f8abac18d71276dd5bbd1f27be2
Author: Brian Paul <brianp@vmware.com>
Date:   Fri Dec 10 14:59:32 2010 -0700

    st/mesa: make vertex shader variants per-context

    Gallium shaders are per-context but OpenGL shaders aren't.  So we need
    to make a different variant for each context.

    During context tear-down we need to walk over all shaders/programs and
    free all variants for the context being destroyed.

13 years agomesa, st/mesa: disable GL_ARB_geometry_shader4
Brian Paul [Tue, 14 Dec 2010 00:01:30 +0000 (17:01 -0700)]
mesa, st/mesa: disable GL_ARB_geometry_shader4

The new GLSL compiler doesn't support geom shaders yet so disable the
GL_ARB_geometry_shader4 extension.  Undo this when geom shaders work again.

NOTE: This is a candidate for the 7.10 branch.

13 years agoir_to_mesa: Don't generate swizzles for record derefs of non-scalar/vectors
Ian Romanick [Mon, 13 Dec 2010 23:42:46 +0000 (15:42 -0800)]
ir_to_mesa: Don't generate swizzles for record derefs of non-scalar/vectors

This is the same as what the array dereference handler does.

Fixes piglit test glsl-link-struct-array (bugzilla #31648).

NOTE: This is a candidate for the 7.9 and 7.10 branches.

13 years agolinker: Allow built-in arrays to have different sizes between shader stages
Ian Romanick [Mon, 13 Dec 2010 23:16:39 +0000 (15:16 -0800)]
linker: Allow built-in arrays to have different sizes between shader stages

Fixes pitlit test glsl-link-varying-TexCoord (bugzilla #31650).

13 years agoi965: Fix gl_FragCoord.z setup on gen6.
Eric Anholt [Mon, 13 Dec 2010 21:37:54 +0000 (13:37 -0800)]
i965: Fix gl_FragCoord.z setup on gen6.

Fixes glsl-bug-22603.

13 years agoi956: Fix the old FP path fragment position setup on gen6.
Eric Anholt [Mon, 13 Dec 2010 20:15:21 +0000 (12:15 -0800)]
i956: Fix the old FP path fragment position setup on gen6.

Fixes fp-arb-fragment-coord-conventions-none

13 years agoi965: Fix ARL to work on gen6.
Eric Anholt [Mon, 13 Dec 2010 19:44:26 +0000 (11:44 -0800)]
i965: Fix ARL to work on gen6.

RNDD isn't one of the instructions that can do conversion from
execution type to destination type.

Fixes glsl-vs-arrays-3.

13 years agointel: Include stdbool so we can stop using GLboolean when we want to.
Eric Anholt [Mon, 13 Dec 2010 19:02:15 +0000 (11:02 -0800)]
intel: Include stdbool so we can stop using GLboolean when we want to.

This requires shuffling the driconf XML macros around, since they use
true and false tokens expecting them to not get expanded to anything.

13 years agogallivm: store callbacks in a linked list rather than fixed size array
Brian Paul [Mon, 13 Dec 2010 18:47:26 +0000 (11:47 -0700)]
gallivm: store callbacks in a linked list rather than fixed size array

Should fix http://bugs.freedesktop.org/show_bug.cgi?id=32308

13 years agotnl: a better way to initialize the gl_program_machine memory
Brian Paul [Mon, 13 Dec 2010 15:11:56 +0000 (08:11 -0700)]
tnl: a better way to initialize the gl_program_machine memory

This improves commit ef3f7e61b314236cbb7ed2cf24d34c6f90d9cfca

NOTE: This is a candidate for the 7.9 and 7.10 branches.

13 years agor600g: fix rendering with a vertex attrib having a zero stride
Alex Deucher [Mon, 13 Dec 2010 03:44:53 +0000 (22:44 -0500)]
r600g: fix rendering with a vertex attrib having a zero stride

The hardware supports zero stride just fine.  This is a port
of 2af8a1983180fc0168c1e0e53bcc69ee3d684ea4 from r300g.

NOTE: This is a candidate for both the 7.9 and 7.10 branches.

Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
13 years agor300g: fixup rs690 tiling stride alignment calculations.
Dave Airlie [Fri, 10 Dec 2010 05:40:48 +0000 (15:40 +1000)]
r300g: fixup rs690 tiling stride alignment calculations.

The RS690 memory controller prefers things to be on a different
boundary than the discrete GPUs, we had an attempt to fix this,
but it still failed, this consolidates the stride calculation
into one place and removes the really special case check.

This fixes gnome-shell and 16 piglit tests on my rs690 system.

NOTE: This is a candidate for both the 7.9 and 7.10 branches.

Signed-off-by: Dave Airlie <airlied@redhat.com>
13 years agoegl: Do not unload drivers.
Chia-I Wu [Sun, 12 Dec 2010 10:13:27 +0000 (18:13 +0800)]
egl: Do not unload drivers.

When the driver is the last reference to libEGL.so, unloading it will
cause libEGL.so to be unmapped and give problems.  Disable the unloading
for now.  Still have to figure out the right timing to unload drivers.

13 years agomapi: Fix a warning in !THREADS build.
Chia-I Wu [Sun, 12 Dec 2010 09:56:49 +0000 (17:56 +0800)]
mapi: Fix a warning in !THREADS build.

It should be u_thread_self, not _glthread_GetID.

13 years agomesa: Clean up header file inclusion in nvfragparse.h.
Vinson Lee [Sat, 11 Dec 2010 22:37:18 +0000 (14:37 -0800)]
mesa: Clean up header file inclusion in nvfragparse.h.

13 years agomesa: Clean up header file inclusion in ir_to_mesa.h.
Vinson Lee [Sat, 11 Dec 2010 21:30:13 +0000 (13:30 -0800)]
mesa: Clean up header file inclusion in ir_to_mesa.h.

13 years agor300g: fix rendering with a vertex attrib having a zero stride
Marek Olšák [Sat, 11 Dec 2010 13:45:27 +0000 (14:45 +0100)]
r300g: fix rendering with a vertex attrib having a zero stride

The hardware apparently does support a zero stride, so let's use it.

This fixes missing objects in ETQW, but might also fix a ton of other
similar-looking bugs.

NOTE: This is a candidate for both the 7.9 and 7.10 branches.

13 years agotgsi: fix rbug compile error
Marek Olšák [Sat, 11 Dec 2010 07:38:39 +0000 (08:38 +0100)]
tgsi: fix rbug compile error

../mesa/src/gallium/auxiliary/tgsi/tgsi_parse.h:139:
error: dereferencing pointer ‘tokens.25’ does break strict-aliasing rules

Signed-off-by: Marek Olšák <maraeo@gmail.com>
13 years agor300/compiler: fix swizzle lowering with a presubtract source operand
Marek Olšák [Sat, 11 Dec 2010 12:22:19 +0000 (13:22 +0100)]
r300/compiler: fix swizzle lowering with a presubtract source operand

If a source operand has a non-native swizzle (e.g. the KIL instruction
cannot have a swizzle other than .xyzw), the lowering pass uses one or more
MOV instructions to move the operand to an intermediate temporary with
native swizzles.

This commit fixes that the presubtract information was lost during
the lowering.

NOTE: This is a candidate for both the 7.9 and 7.10 branches.

13 years agor300/compiler: fix LIT in VS
Marek Olšák [Sat, 11 Dec 2010 06:32:24 +0000 (07:32 +0100)]
r300/compiler: fix LIT in VS

This fixes broken rendering of trees in ETQW. The trees still disappear
for an unknown reason when they are close.

Broken since:
2ff9d4474bdf5f05852ad4963d0b597d20743678
r300/compiler: make lowering passes possibly use up to two less temps

NOTE: This is a candidate for the 7.10 branch.

13 years agoglsl: Inherrit type of declared variable from initializer after processing assignment
Ian Romanick [Fri, 10 Dec 2010 23:48:15 +0000 (15:48 -0800)]
glsl: Inherrit type of declared variable from initializer after processing assignment

do_assignment may apply implicit conversions to coerce the base type
of initializer to the base type of the variable being declared.  Fixes
piglit test glsl-implicit-conversion-02 (bugzilla #32287).  This
probably also fixes bugzilla #32273.

NOTE: This is a candidate for the 7.9 branch and the 7.10 branch.

13 years agoglsl: Minor clean-up in validate_assignment
Ian Romanick [Fri, 10 Dec 2010 23:47:11 +0000 (15:47 -0800)]
glsl: Minor clean-up in validate_assignment

This code has been changed around a lot, and there were some temporary
variables left around from previous versions.

13 years agoi965: Put common info on converting MESA_FORMAT to BRW_FORMAT in a table.
Eric Anholt [Fri, 10 Dec 2010 21:09:55 +0000 (13:09 -0800)]
i965: Put common info on converting MESA_FORMAT to BRW_FORMAT in a table.

There are exceptions to the table for depth texturing or rendering to
not-quite-supported formats thanks to the non-orthogonal component
selection for surface formats, but it's still a lot simpler.

13 years agointel: Just use ChooseTextureFormat for renderbuffer format choice.
Eric Anholt [Fri, 10 Dec 2010 01:15:26 +0000 (17:15 -0800)]
intel: Just use ChooseTextureFormat for renderbuffer format choice.

One less place to forget to put your new MESA_FORMAT support in.

13 years agointel: Add a couple of helper functions to reduce rb code duplication.
Eric Anholt [Fri, 10 Dec 2010 01:08:31 +0000 (17:08 -0800)]
intel: Add a couple of helper functions to reduce rb code duplication.

13 years agointel: Add spans code for the ARB_texture_rg support.
Eric Anholt [Fri, 10 Dec 2010 01:30:41 +0000 (17:30 -0800)]
intel: Add spans code for the ARB_texture_rg support.

This starts spantmp2.h down the path of using MESA_FORMAT_* for
specifying the format instead of the crazy GL format/type combo.

13 years agomesa: Don't assertion fail for _mesa_get_format_name(MESA_FORMAT_NONE)
Eric Anholt [Fri, 10 Dec 2010 19:34:41 +0000 (11:34 -0800)]
mesa: Don't assertion fail for _mesa_get_format_name(MESA_FORMAT_NONE)

13 years agotnl: Initialize gl_program_machine memory in run_vp.
Vinson Lee [Fri, 10 Dec 2010 22:24:05 +0000 (14:24 -0800)]
tnl: Initialize gl_program_machine memory in run_vp.

Fixes piglit valgrind glsl-array-bounds-04 failure (FDO bug 29946).

NOTE:
This is a candidate for the 7.10 branch.
This is a candidate for the 7.9 branch.

13 years agovbo: Avoid the copy to current in dlists if not required.
Mathias Fröhlich [Sun, 17 Oct 2010 16:16:30 +0000 (18:16 +0200)]
vbo: Avoid the copy to current in dlists if not required.

The current state is allowed to be undefined past DrawElements et al.
Consequently omit that copying at least in the display list code.
This pays us some percents performance.

Signed-off-by: Brian Paul <brianp@vmware.com>
13 years agomesa/meta: fix broken assertion, rename stack depth var
Brian Paul [Fri, 10 Dec 2010 17:02:33 +0000 (10:02 -0700)]
mesa/meta: fix broken assertion, rename stack depth var

assert(current_save_state < MAX_META_OPS_DEPTH) did not compile.

Rename current_save_state to SaveStackDepth to be more consistent with
the style of the other fields.

13 years agor600g: fix bo size when creating bo from handle
Jerome Glisse [Fri, 10 Dec 2010 16:17:27 +0000 (11:17 -0500)]
r600g: fix bo size when creating bo from handle

Spoted by Alex Diomin

Signed-off-by: Jerome Glisse <jglisse@redhat.com>
13 years agomesa: Clean up header file inclusion in arbprogparse.h.
Vinson Lee [Fri, 10 Dec 2010 07:52:28 +0000 (23:52 -0800)]
mesa: Clean up header file inclusion in arbprogparse.h.

13 years agoi965: support for two-sided lighting on Sandybridge
Xiang, Haihao [Fri, 10 Dec 2010 05:01:44 +0000 (13:01 +0800)]
i965: support for two-sided lighting on Sandybridge

VS places color attributes together so that SF unit can fetch the right
attribute according to object orientation. This fixes light issue in
mesa demo geartrain, projtex.

13 years agometa: allow nested meta operations
Xiang, Haihao [Fri, 10 Dec 2010 01:31:19 +0000 (09:31 +0800)]
meta: allow nested meta operations

_mesa_meta_CopyPixels results in nested meta operations on Sandybridge.
Previoulsy the second meta operation overrides all states saved by the
first meta function.

13 years agoi965: Add support for gen6 reladdr VS constant loading.
Eric Anholt [Thu, 9 Dec 2010 17:42:05 +0000 (09:42 -0800)]
i965: Add support for gen6 reladdr VS constant loading.

13 years agoi965: Add support for gen6 constant-index constant loading.
Eric Anholt [Thu, 9 Dec 2010 17:36:17 +0000 (09:36 -0800)]
i965: Add support for gen6 constant-index constant loading.

13 years agotargets/egl: Improve st_GL.so loading.
Chia-I Wu [Fri, 10 Dec 2010 02:44:03 +0000 (10:44 +0800)]
targets/egl: Improve st_GL.so loading.

When the application is not linked to any libGL*.so, loading st_GL.so
would give

  /usr/local/lib/egl/st_GL.so: undefined symbol: _glapi_tls_Context

In that case, load libGL.so and try again.  This works because
util_dl_open loads with RTLD_GLOBAL.

Fix "clear" OpenGL ES 1.1 demo.

13 years agotarget/egl: Fix misleading debug message.
Chia-I Wu [Fri, 10 Dec 2010 02:28:57 +0000 (10:28 +0800)]
target/egl: Fix misleading debug message.

When the name of the module is NULL, the process itself is dlopen()ed.
Do not print

  libEGL debug: searching for st module (null)

13 years agodraw/llvm: don't flush in vs_llvm_delete()
Brian Paul [Fri, 10 Dec 2010 01:37:59 +0000 (18:37 -0700)]
draw/llvm: don't flush in vs_llvm_delete()

Fixes piglit glx-shader-sharing crash.

When shaders are shared by multiple contexts, the shader's draw context
pointer may point to a previously destroyed context.  Dereferencing the
context pointer will lead to a crash.

In this case, simply removing the flushing code avoids the crash (the
exec and sse shader paths don't flush here either).

There's a deeper issue here, however, that needs examination.  Shaders
should not keep pointers to contexts since contexts might get destroyed
at any time.

NOTE: This is a candidate for the 7.10 branch (after this has been
tested for a while).

13 years agodraw/llvm: remove redundant comment
Brian Paul [Thu, 9 Dec 2010 23:02:28 +0000 (16:02 -0700)]
draw/llvm: remove redundant comment

13 years agodraw/llvm: remove extraneous conditional
Brian Paul [Thu, 9 Dec 2010 23:02:12 +0000 (16:02 -0700)]
draw/llvm: remove extraneous conditional

13 years agoglsl: Unroll loops with conditional breaks anywhere (not just the end)
Luca Barbieri [Wed, 1 Dec 2010 23:12:07 +0000 (15:12 -0800)]
glsl: Unroll loops with conditional breaks anywhere (not just the end)

Currently we only unroll loops with conditional breaks at the end, which is
the form that lower_jumps generates.

However, if breaks are not lowered, they tend to appear at the beginning, so
add support for a conditional break anywhere.

Signed-off-by: Luca Barbieri <luca@luca-barbieri.com>
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
13 years agoglsl: Consider the "else" branch when looking for loop breaks.
Kenneth Graunke [Wed, 1 Dec 2010 23:33:56 +0000 (15:33 -0800)]
glsl: Consider the "else" branch when looking for loop breaks.

Found this bug by code inspection.  Based off the comments just before
this code, the intent is to find whether the break exists in the "then"
branch or the "else" branch.  However, the code actually looked at the
last instruction in the "then" branch twice.

13 years agoglsl: Clean up code by adding a new is_break() function.
Kenneth Graunke [Wed, 1 Dec 2010 23:06:47 +0000 (15:06 -0800)]
glsl: Clean up code by adding a new is_break() function.

13 years agoglsl: Correct the marking of InputsRead/OutputsWritten on in/out matrices.
Eric Anholt [Thu, 9 Dec 2010 22:31:43 +0000 (14:31 -0800)]
glsl: Correct the marking of InputsRead/OutputsWritten on in/out matrices.

If you used a constant array index to access the matrix, we'd flag a
bunch of wrong inputs/outputs as being used because the index was
multiplied by matrix columns and the actual used index was left out.

Fixes glsl-mat-attribute.

13 years agointel: Set the swizzling for depth textures using the GL_RED depth mode.
Eric Anholt [Thu, 9 Dec 2010 21:51:21 +0000 (13:51 -0800)]
intel: Set the swizzling for depth textures using the GL_RED depth mode.

Fixes depth-tex-modes-rg.

13 years agointel: Use plain R8 and RG8 for COMPRESSED_RED and COMPRESSED_RG.
Eric Anholt [Thu, 9 Dec 2010 21:45:47 +0000 (13:45 -0800)]
intel: Use plain R8 and RG8 for COMPRESSED_RED and COMPRESSED_RG.

Fixes texture-rg.

13 years agoi965: Silence uninitialized variable warning.
Vinson Lee [Thu, 9 Dec 2010 22:17:17 +0000 (14:17 -0800)]
i965: Silence uninitialized variable warning.

Fixes this GCC warning.
brw_fs.cpp: In function 'brw_reg brw_reg_from_fs_reg(fs_reg*)':
brw_fs.cpp:3255: warning: 'brw_reg' may be used uninitialized in this function

13 years agor600g: Fix SCons build.
Vinson Lee [Thu, 9 Dec 2010 22:03:58 +0000 (14:03 -0800)]
r600g: Fix SCons build.

13 years agor600g: indentation cleanup
Jerome Glisse [Thu, 9 Dec 2010 21:16:22 +0000 (16:16 -0500)]
r600g: indentation cleanup

Signed-off-by: Jerome Glisse <jglisse@redhat.com>
13 years agor600g: specialized upload manager
Jerome Glisse [Wed, 8 Dec 2010 18:41:25 +0000 (13:41 -0500)]
r600g: specialized upload manager

Allow important performance increase by doing hw specific implementation
of the upload manager helper. Drop the range flushing that is not hit with
this code (and wasn't with previous neither). Performance improvement are
mostly visible on slow CPU.

Signed-off-by: Jerome Glisse <jglisse@redhat.com>
13 years agor600g: avoid using pb* helper we are loosing previous cpu cycle with it
Jerome Glisse [Thu, 9 Dec 2010 18:07:10 +0000 (13:07 -0500)]
r600g: avoid using pb* helper we are loosing previous cpu cycle with it

r600g is up to a point where all small CPU cycle matter and pb* turn
high on profile. It's mostly because pb try to be generic and thus
trigger unecessary check for r600g driver. To avoid having too much
abstraction & too much depth in the call embedded everythings into
r600_bo. Make code simpler & faster. The performance win highly depend
on the CPU & application considered being more important on slower CPU
and marginal/unoticeable on faster one.

Signed-off-by: Jerome Glisse <jglisse@redhat.com>
13 years agoglsl: fix lowering conditional returns in subroutines
Fabian Bieler [Wed, 1 Dec 2010 13:44:58 +0000 (14:44 +0100)]
glsl: fix lowering conditional returns in subroutines

this fix applies to the lower_sub_return 'branch' of the lower_jumps pass

Fixes piglit tests glsl-functions-5 and glsl-functions-6.

13 years agoi965: remove unused variable since brw_wm_glsl.c removal.
Eric Anholt [Thu, 9 Dec 2010 19:10:31 +0000 (11:10 -0800)]
i965: remove unused variable since brw_wm_glsl.c removal.

13 years agoi965: Set render_cache_read_write surface state bit on gen6 constant surfs.
Eric Anholt [Thu, 9 Dec 2010 18:03:49 +0000 (10:03 -0800)]
i965: Set render_cache_read_write surface state bit on gen6 constant surfs.

This is said to be required in the spec, even when you aren't doing writes.

13 years agoi965: Set up the correct texture border color state struct for Ironlake.
Eric Anholt [Wed, 16 Jun 2010 00:58:14 +0000 (17:58 -0700)]
i965: Set up the correct texture border color state struct for Ironlake.

This doesn't actually fix border color on Ironlake, but it appears to
be a requirement, and gen6 needs it too.

13 years agoi965: Clean up VS constant buffer location setup.
Eric Anholt [Thu, 9 Dec 2010 17:26:41 +0000 (09:26 -0800)]
i965: Clean up VS constant buffer location setup.

13 years agoi965: Fix VS constants regression pre-gen6.
Eric Anholt [Thu, 9 Dec 2010 17:17:59 +0000 (09:17 -0800)]
i965: Fix VS constants regression pre-gen6.

Last minute change for gen6 with 0 used params dropped the multiply.

13 years agollvmpipe: Plug fence leaks.
José Fonseca [Tue, 7 Dec 2010 16:59:25 +0000 (16:59 +0000)]
llvmpipe: Plug fence leaks.

13 years agomesa: allow GLfixed arrays for OpenGL ES 2.0
Shuang He [Thu, 9 Dec 2010 00:49:51 +0000 (08:49 +0800)]
mesa: allow GLfixed arrays for OpenGL ES 2.0

Signed-off-by: Brian Paul <brianp@vmware.com>
13 years agomesa: Fix glTexCoordPointer with type GL_FIXED.
Chia-I Wu [Thu, 9 Dec 2010 11:37:15 +0000 (19:37 +0800)]
mesa: Fix glTexCoordPointer with type GL_FIXED.

GL_FIXED is also a legal type for glTexCoordPointer.

13 years agomesa: Fix GL_FIXED arrays.
Chia-I Wu [Thu, 9 Dec 2010 11:05:50 +0000 (19:05 +0800)]
mesa: Fix GL_FIXED arrays.

It is broken since 433e5e6defc85d8b1d6262aff990e3f5a8b37027.

13 years agoi965: Drop push-mode reladdr constant loading and always use constant_map.
Eric Anholt [Thu, 9 Dec 2010 01:00:54 +0000 (17:00 -0800)]
i965: Drop push-mode reladdr constant loading and always use constant_map.

This eases the gen6 implementation, which can only handle up to 32
registers of constants, while likely not penalizing real apps using
reladdr since all of those I've seen also end up hitting the pull
constant buffer.  On gen6, the constant map means that simple NV VPs
fit under the 32-reg limit and now succeed.  Fixes around 10 testcases.

13 years agoradeon: bump mip tree levels to 15
Alex Deucher [Thu, 9 Dec 2010 05:13:21 +0000 (00:13 -0500)]
radeon: bump mip tree levels to 15

I forgot to bump this when I bumped the tex levels.

13 years agomesa: simplify target checking for TexImage functions
Brian Paul [Thu, 9 Dec 2010 04:38:35 +0000 (21:38 -0700)]
mesa: simplify target checking for TexImage functions

13 years agomesa: revamp error checking for compressed texture images
Brian Paul [Thu, 9 Dec 2010 04:38:35 +0000 (21:38 -0700)]
mesa: revamp error checking for compressed texture images

Simplify some code, remove unneeded checks, etc.

13 years agoglsl: In ast_to_hir, check sampler array indexing
Chad Versace [Tue, 7 Dec 2010 18:35:36 +0000 (10:35 -0800)]
glsl: In ast_to_hir, check sampler array indexing

Raise error if a sampler array is indexed with a non-constant expression.

From section 4.1.7 of the GLSL 1.30 spec:
  "Samplers aggregated into arrays within a shader (using square
  brackets [ ]) can only be indexed with integral constant
  expressions [...]."

13 years agoi965: Drop KIL_NV from the ff/ARB_fp path since it was only used for GLSL.
Eric Anholt [Wed, 8 Dec 2010 18:59:58 +0000 (10:59 -0800)]
i965: Drop KIL_NV from the ff/ARB_fp path since it was only used for GLSL.

13 years agoi965: Use the new pixel mask location for gen6 ARB_fp KIL instructions.
Eric Anholt [Wed, 8 Dec 2010 18:57:22 +0000 (10:57 -0800)]
i965: Use the new pixel mask location for gen6 ARB_fp KIL instructions.

Fixes:
fp-kil
fp-generic/kil-swizzle.