mesa.git
13 years agost/egl: Remove native_config::slow_config.
Chia-I Wu [Wed, 22 Dec 2010 04:22:42 +0000 (12:22 +0800)]
st/egl: Remove native_config::slow_config.

In direct rendering scenario, it is not needed until an EGLDisplay can
support both HW and SW pipe screens.

13 years agost/egl: Remove unnecessary egl_g3d_find_pixmap_config.
Chia-I Wu [Wed, 22 Dec 2010 04:19:12 +0000 (12:19 +0800)]
st/egl: Remove unnecessary egl_g3d_find_pixmap_config.

It was used to find a compatible config for a given pixmap.  Now that a
config is optional for pixmap surface creation, the function is not
needed.

13 years agost/egl: Make config optional for create_pixmap_surface.
Chia-I Wu [Wed, 22 Dec 2010 04:14:44 +0000 (12:14 +0800)]
st/egl: Make config optional for create_pixmap_surface.

eglCopyBuffers or EGL_KHR_image_pixmap require creating a pixmap surface
without a config.  Make it just work without relying on
is_pixmap_supported.

13 years agor600g: fix evergreen segfaults.
Dave Airlie [Wed, 22 Dec 2010 04:54:17 +0000 (14:54 +1000)]
r600g: fix evergreen segfaults.

evergreen was crashing running even gears here.

This is a 7.10 candidate if its broken the same.

Signed-off-by: Dave Airlie <airlied@redhat.com>
13 years agor300g: fix precision issues with B10G10R10A2
Marek Olšák [Wed, 22 Dec 2010 01:22:09 +0000 (02:22 +0100)]
r300g: fix precision issues with B10G10R10A2

13 years agor300g: support B10G10R10A2 render targets only with DRM 2.8.0 or later versions
Marek Olšák [Tue, 21 Dec 2010 18:26:27 +0000 (19:26 +0100)]
r300g: support B10G10R10A2 render targets only with DRM 2.8.0 or later versions

13 years agoi965: Avoid using float type for raw moves, to work around SNB issue.
Eric Anholt [Tue, 21 Dec 2010 21:04:07 +0000 (13:04 -0800)]
i965: Avoid using float type for raw moves, to work around SNB issue.

The SNB alt-mode math does the denorm and inf reduction even for a
"raw MOV" like we do for g0 message header setup, where we are moving
values that aren't actually floats.  Just use UD type, where raw MOVs
really are raw MOVs.

Fixes glxgears since c52adfc2e1d130effea940e75690897eb5d3ceaa, but no
piglit tests had regressed(!)

13 years agor600g: avoid segfault
Jerome Glisse [Tue, 21 Dec 2010 15:49:53 +0000 (10:49 -0500)]
r600g: avoid segfault

Candidates 7.10

Signed-off-by: Jerome Glisse <jglisse@redhat.com>
13 years agointel: Check for unsupported texture when finishing using as a render target
Chris Wilson [Tue, 21 Dec 2010 11:55:11 +0000 (11:55 +0000)]
intel: Check for unsupported texture when finishing using as a render target

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=32541
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
13 years agost/mesa: Clean up header file inclusion in st_format.h.
Vinson Lee [Tue, 21 Dec 2010 09:25:04 +0000 (01:25 -0800)]
st/mesa: Clean up header file inclusion in st_format.h.

13 years agost/mesa: Clean up header file inclusion in st_draw.h.
Vinson Lee [Tue, 21 Dec 2010 09:17:37 +0000 (01:17 -0800)]
st/mesa: Clean up header file inclusion in st_draw.h.

13 years agonouveau: fix includes for latest libdrm
Ben Skeggs [Mon, 20 Dec 2010 03:39:36 +0000 (13:39 +1000)]
nouveau: fix includes for latest libdrm

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
13 years agoRegenerate gl_mangle.h.
Tom Fogal [Tue, 21 Dec 2010 02:24:29 +0000 (19:24 -0700)]
Regenerate gl_mangle.h.

NOTE: This is a candidate for the 7.10 branch.

13 years agor600g: properly unset vertex buffer
Jerome Glisse [Mon, 20 Dec 2010 20:30:42 +0000 (15:30 -0500)]
r600g: properly unset vertex buffer

Fix bug http://bugs.freedesktop.org/show_bug.cgi?id=32455

Signed-off-by: Jerome Glisse <jglisse@redhat.com>
13 years agost/python: remove unused 'buf' parameter in pipe_buffer_unmap
Vinson Lee [Mon, 20 Dec 2010 19:40:54 +0000 (11:40 -0800)]
st/python: remove unused 'buf' parameter in pipe_buffer_unmap

This is a follow-up to commit ec51092a72e2dff1e9b1362d813fe4691cda89b7.

Fixes SCons build.

13 years agogallium: remove unused 'buf' parameter in pipe_buffer_unmap
Marek Olšák [Sun, 19 Dec 2010 03:17:43 +0000 (04:17 +0100)]
gallium: remove unused 'buf' parameter in pipe_buffer_unmap

13 years agost/mesa: Remove comment cruft from st_context.h.
Vinson Lee [Mon, 20 Dec 2010 09:24:26 +0000 (01:24 -0800)]
st/mesa: Remove comment cruft from st_context.h.

This was unintentionally added by commit
1525fb4afec0adc164948b4060ec1c0359441cd3.

13 years agost/mesa: Clean up header file inclusion in st_cb_texture.h.
Vinson Lee [Mon, 20 Dec 2010 09:15:04 +0000 (01:15 -0800)]
st/mesa: Clean up header file inclusion in st_cb_texture.h.

13 years agost/mesa: Clean up header file inclusion in st_cb_readpixels.h.
Vinson Lee [Mon, 20 Dec 2010 09:00:26 +0000 (01:00 -0800)]
st/mesa: Clean up header file inclusion in st_cb_readpixels.h.

13 years agor300g: optimize the fallback for misaligned ushort indices
Marek Olšák [Sun, 19 Dec 2010 01:54:43 +0000 (02:54 +0100)]
r300g: optimize the fallback for misaligned ushort indices

13 years agost/mesa: Clean up header file inclusion in st_cb_program.h.
Vinson Lee [Sat, 18 Dec 2010 09:44:52 +0000 (01:44 -0800)]
st/mesa: Clean up header file inclusion in st_cb_program.h.

13 years agost/mesa: Clean up header file inclusion in st_cb_accum.h.
Vinson Lee [Sat, 18 Dec 2010 09:28:18 +0000 (01:28 -0800)]
st/mesa: Clean up header file inclusion in st_cb_accum.h.

13 years agomesa: Clean up header file inclusion in prog_statevars.h.
Vinson Lee [Sat, 18 Dec 2010 09:16:53 +0000 (01:16 -0800)]
mesa: Clean up header file inclusion in prog_statevars.h.

13 years agomesa: fix queryobj whitespace.
Dave Airlie [Sat, 18 Dec 2010 07:48:21 +0000 (17:48 +1000)]
mesa: fix queryobj whitespace.

Had done this before pushing but forgot to amend, doh.

13 years agomesa/swrast/st: add ARB_occlusion_query2 support.
Dave Airlie [Sat, 11 Sep 2010 20:31:30 +0000 (06:31 +1000)]
mesa/swrast/st: add ARB_occlusion_query2 support.

This gets my vote for most pointless extension of all time, I'm guessing
some driver could possibly optimise for this instead of counting it might
just get a true/false, but I'm not really sure.

need this to eventually advertise 3.3 despite its total uselessness.

Signed-off-by: Dave Airlie <airlied@redhat.com>
13 years agomapi: Clean up sources.mk.
Chia-I Wu [Fri, 10 Dec 2010 19:27:54 +0000 (03:27 +0800)]
mapi: Clean up sources.mk.

Rename MAPI_GLAPI_SOURCES to MAPI_UTIL_SOURCES.  Rename macro
MAPI_GLAPI_CURRENT to MAPI_MODE_UTIL.  Update the comments to make it
clear that mapi may be used in two ways and how.

13 years agomapi: Clean up u_current interface.
Chia-I Wu [Fri, 10 Dec 2010 09:14:04 +0000 (17:14 +0800)]
mapi: Clean up u_current interface.

Try not to use macros to make u_current.h appear to be glapi.h.  Use
u_current.h to implement glapi.h instead whenever possible.

13 years agomapi: Add ABI-tag note.
Chia-I Wu [Thu, 16 Dec 2010 19:11:53 +0000 (03:11 +0800)]
mapi: Add ABI-tag note.

TLS requires kernel >= 2.4.20.  Per glapi.

13 years agoRefresh autogenerated file builtin_function.cpp.
Kenneth Graunke [Sat, 18 Dec 2010 03:28:47 +0000 (19:28 -0800)]
Refresh autogenerated file builtin_function.cpp.

NOTE: The 7.9 and 7.10 branches will need their builtins refreshed too.
Rather than cherry-picking this commit, run 'make builtins'.

13 years agoglsl/builtins: Compute the correct value for smoothstep(vec, vec, vec).
Kenneth Graunke [Sat, 18 Dec 2010 03:25:37 +0000 (19:25 -0800)]
glsl/builtins: Compute the correct value for smoothstep(vec, vec, vec).

These mistakenly computed 't' instead of t * t * (3.0 - 2.0 * t).

Also, properly vectorize the smoothstep(float, float, vec) variants.

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

13 years agogallivm: Cleanup util_format_xxx_fetch_xxx call generation.
José Fonseca [Fri, 17 Dec 2010 20:08:35 +0000 (20:08 +0000)]
gallivm: Cleanup util_format_xxx_fetch_xxx call generation.

No need to register function prototypes in the module now that we call
the C function pointer directly -- less LLVM objects lying around.

Limited testing with lp_test_format.

13 years agoglsl: Expose a public glsl_type::void_type const pointer.
Kenneth Graunke [Mon, 13 Dec 2010 19:19:38 +0000 (11:19 -0800)]
glsl: Expose a public glsl_type::void_type const pointer.

This is analogous to glsl_type::int_type and all the others.

13 years agor300g: finally fix the texture corruption on r3xx-r4xx
Marek Olšák [Fri, 17 Dec 2010 07:59:32 +0000 (08:59 +0100)]
r300g: finally fix the texture corruption on r3xx-r4xx

Even though a bound texture stays bound when calling set_fragment_sampler_views,
it must be assigned a new cache region depending on the occupancy of other
texture units.

This fixes:
https://bugs.freedesktop.org/show_bug.cgi?id=28800

Thanks to Álmos <aaalmosss@gmail.com> for finding the bug in the code.

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

13 years agoRemove OES_compressed_paletted_texture from the ES2 extension list.
Kenneth Graunke [Fri, 17 Dec 2010 01:40:00 +0000 (17:40 -0800)]
Remove OES_compressed_paletted_texture from the ES2 extension list.

We don't support it.

13 years agosoftpipe: remove sp_tex_tile_cache_border_color()
Brian Paul [Fri, 17 Dec 2010 01:17:20 +0000 (18:17 -0700)]
softpipe: remove sp_tex_tile_cache_border_color()

With swizzling done at the end of texture sampling, we can greatly
simplify swizzling of the border color.

Fixes http://bugs.freedesktop.org/show_bug.cgi?id=32460

13 years agosoftpipe: fix depth texture sampling regression
Brian Paul [Fri, 17 Dec 2010 00:38:16 +0000 (17:38 -0700)]
softpipe: fix depth texture sampling regression

We need to keep using the pipe_get_tile_swizzle() even though there's
no swizzling because we need to explicitly pass in the surface format.

Fixes http://bugs.freedesktop.org/show_bug.cgi?id=32459

13 years agogallivm: fix copy&paste error from previous commit
Brian Paul [Thu, 16 Dec 2010 21:29:15 +0000 (14:29 -0700)]
gallivm: fix copy&paste error from previous commit

Fixes piglit regression, http://bugs.freedesktop.org/show_bug.cgi?id=32452

NOTE: This is a candidate for the 7.10 branch

13 years agor600c : inline vertex format is not updated in an app, switch to use vfetch constants...
richard [Thu, 16 Dec 2010 20:52:55 +0000 (15:52 -0500)]
r600c : inline vertex format is not updated in an app, switch to use vfetch constants. For the 7.9 and 7.10 branches as well.

13 years agointel: Support glCopyTexImage() from XRGB8888 to ARGB8888.
Eric Anholt [Wed, 15 Dec 2010 20:10:03 +0000 (12:10 -0800)]
intel: Support glCopyTexImage() from XRGB8888 to ARGB8888.

The only mismatch between the two is that we have to clear the
destination's alpha to 1.0.  Fixes WOW performance on my Ironlake,
from a few frames a second to almost playable.

13 years agointel: Try to sanely check that formats match for CopyTexImage.
Eric Anholt [Wed, 15 Dec 2010 19:54:38 +0000 (11:54 -0800)]
intel: Try to sanely check that formats match for CopyTexImage.

Before, we were going off of a couple of known (hopeful) matches
between internalFormats and the cpp of the read buffer.  Instead, we
can now just look at the gl_format of the two to see if they match.
We should avoid bad blits that might have been possible before, but
also allow different internalFormats to work without having to
enumerate each one.

13 years agointel: Drop commented intel_flush from copy_teximage.
Eric Anholt [Wed, 15 Dec 2010 19:46:37 +0000 (11:46 -0800)]
intel: Drop commented intel_flush from copy_teximage.

The blit that follows appears in the command stream so it's serialized
with previous rendering.  Any queued vertices in the tnl layer were
already flushed up in mesa/main/.

13 years agointel: Update renderbuffers before looking up CopyTexImage's read buffer.
Eric Anholt [Wed, 15 Dec 2010 19:37:45 +0000 (11:37 -0800)]
intel: Update renderbuffers before looking up CopyTexImage's read buffer.

Not fixing a particular bug, just noticed by code inspection.

13 years agogallivm: work around LLVM 2.6 bug when calling C functions
Brian Paul [Thu, 16 Dec 2010 17:13:02 +0000 (10:13 -0700)]
gallivm: work around LLVM 2.6 bug when calling C functions

Create a constant int pointer to the C function, then cast it to the
function's type.  This avoids using trampoline code which seem to be
inadvertantly freed by LLVM in some situations (which leads to segfaults).
The root issue and work-around were found by José.

NOTE: This is a candidate for the 7.10 branch

13 years agodraw: s/varient/variant/
Brian Paul [Thu, 16 Dec 2010 15:50:42 +0000 (08:50 -0700)]
draw: s/varient/variant/

13 years agosvga: s/varient/variant/
Brian Paul [Thu, 16 Dec 2010 15:50:30 +0000 (08:50 -0700)]
svga: s/varient/variant/

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.