mesa.git
14 years agogallium: make valuemask/writemask in pipe_stencil_state bitfield members
Roland Scheidegger [Tue, 9 Feb 2010 20:26:35 +0000 (21:26 +0100)]
gallium: make valuemask/writemask in pipe_stencil_state bitfield members

More consistent with other state data, might allow some compilers to pack
the struct better (doesn't matter for gcc).

14 years agogallium: don't put stencil ref value in pipe_depth_stencil_alpha_state
Roland Scheidegger [Tue, 9 Feb 2010 20:23:27 +0000 (21:23 +0100)]
gallium: don't put stencil ref value in pipe_depth_stencil_alpha_state

This will make driver's life a bit harder, however it makes sense that stencil
reference value is not part of the pipe_depth_stencil_alpha_state, because
it often (there are some algorithms which require this) changes more frequently
than the rest of the dsa state. This is also encouraged by some graphic APIs.
Treat it similar to pipe_blend_color.

14 years agoMerge branch 'gallium-nopointsizeminmax'
Roland Scheidegger [Tue, 9 Feb 2010 18:32:21 +0000 (19:32 +0100)]
Merge branch 'gallium-nopointsizeminmax'

Conflicts:
src/gallium/drivers/nv10/nv10_state.c
src/gallium/drivers/nv20/nv20_state.c
src/gallium/drivers/nv50/nv50_program.c

14 years agodocs: fix typo: s/osdemo/osdemos/
Brian Paul [Tue, 9 Feb 2010 18:21:41 +0000 (11:21 -0700)]
docs: fix typo: s/osdemo/osdemos/

(cherry picked from commit 0371956d66cdc8a1629753fca9cb3cdc49b0d145)

14 years agogallium: Adding the %.s rule to generate asm code
Chris Li [Sat, 6 Feb 2010 05:25:17 +0000 (21:25 -0800)]
gallium: Adding the %.s rule to generate asm code

Signed-off-by: José Fonseca <jfonseca@vmware.com>
14 years agogallium: Using the proper pattern rules for Makefile template.
Chris Li [Sat, 6 Feb 2010 05:22:39 +0000 (21:22 -0800)]
gallium: Using the proper pattern rules for Makefile template.

The .o.c rule is consider obsolete.

Signed-off-by: José Fonseca <jfonseca@vmware.com>
14 years agollvmpipe: Make llvm unit test depend on libllvmpipe.a
Chris Li [Sat, 6 Feb 2010 03:41:32 +0000 (19:41 -0800)]
llvmpipe: Make llvm unit test depend on libllvmpipe.a

Signed-off-by: José Fonseca <jfonseca@vmware.com>
14 years agost/mesa: fix wrong initialization of MaxPointSize
Roland Scheidegger [Mon, 8 Feb 2010 17:48:08 +0000 (18:48 +0100)]
st/mesa: fix wrong initialization of MaxPointSize

14 years agovmware/core: Support drm interface version 1.0.0
Jakob Bornecrantz [Sat, 6 Feb 2010 00:30:29 +0000 (01:30 +0100)]
vmware/core: Support drm interface version 1.0.0

14 years agovmware/core: Use correct flags in scanout code
Jakob Bornecrantz [Sat, 6 Feb 2010 00:29:47 +0000 (01:29 +0100)]
vmware/core: Use correct flags in scanout code

14 years agovmware/core: Handle new scanout field
Jakob Bornecrantz [Sat, 6 Feb 2010 00:21:36 +0000 (01:21 +0100)]
vmware/core: Handle new scanout field

14 years agovmware/core: Update header to latest version
Jakob Bornecrantz [Fri, 5 Feb 2010 23:56:24 +0000 (00:56 +0100)]
vmware/core: Update header to latest version

14 years agovmware/core: Remove old ioctl structs not used
Jakob Bornecrantz [Fri, 29 Jan 2010 16:11:36 +0000 (17:11 +0100)]
vmware/core: Remove old ioctl structs not used

Leftover that was never used in this driver

14 years agollvmpipe: Remove reference to prefilter field.
Michal Krol [Tue, 9 Feb 2010 15:20:55 +0000 (16:20 +0100)]
llvmpipe: Remove reference to prefilter field.

14 years agoglx: Fix TOP setting in src/glx Makefile
Kristian Høgsberg [Tue, 9 Feb 2010 15:21:19 +0000 (10:21 -0500)]
glx: Fix TOP setting in src/glx Makefile

Argh, forgot to commit this fix before pushing.

14 years agoRetire miniglx and move the actual glx code up to src/glx
Kristian Høgsberg [Tue, 9 Feb 2010 14:58:36 +0000 (09:58 -0500)]
Retire miniglx and move the actual glx code up to src/glx

14 years agoegl_dri2: Fix initialization with EGL_DEFAULT_DISPLAY
Kristian Høgsberg [Tue, 9 Feb 2010 14:49:56 +0000 (09:49 -0500)]
egl_dri2: Fix initialization with EGL_DEFAULT_DISPLAY

14 years agofix bug in perspective corrected interpolants for lines
Brian Paul [Fri, 5 Feb 2010 19:57:11 +0000 (12:57 -0700)]
fix bug in perspective corrected interpolants for lines

14 years agoprogs/tests: add line drawing option to cylwrap.c
Brian Paul [Fri, 5 Feb 2010 17:54:40 +0000 (10:54 -0700)]
progs/tests: add line drawing option to cylwrap.c

14 years agoprogs/tests: add x/y rotation to cylwrap.c
Brian Paul [Fri, 5 Feb 2010 17:21:15 +0000 (10:21 -0700)]
progs/tests: add x/y rotation to cylwrap.c

14 years agost/mesa: remove special-case cyl-wrap code
Brian Paul [Fri, 5 Feb 2010 17:18:25 +0000 (10:18 -0700)]
st/mesa: remove special-case cyl-wrap code

Cylinder wrap mode works with perspective interpolation now.

14 years agosoftpipe: Properly implement cylindrical wrapping.
Michal Krol [Fri, 5 Feb 2010 16:12:48 +0000 (17:12 +0100)]
softpipe: Properly implement cylindrical wrapping.

14 years agoRevert "softpipe: Implement cylindrical wrapping for linear interpolator."
Michal Krol [Fri, 5 Feb 2010 14:16:07 +0000 (15:16 +0100)]
Revert "softpipe: Implement cylindrical wrapping for linear interpolator."

This reverts commit 444cd62ca33a45bd39e8408979a0a01c246c6381.

14 years agoprogs/tests: new test program for exercising cylindrical tex wrap mode
Brian Paul [Thu, 4 Feb 2010 23:43:08 +0000 (16:43 -0700)]
progs/tests: new test program for exercising cylindrical tex wrap mode

14 years agost/mesa: check for PROG_PARAM_BIT_CYL_WRAP flag
Brian Paul [Thu, 4 Feb 2010 23:36:55 +0000 (16:36 -0700)]
st/mesa: check for PROG_PARAM_BIT_CYL_WRAP flag

14 years agomesa: add back-door support for cylindrical texture wrap mode
Brian Paul [Thu, 4 Feb 2010 23:40:47 +0000 (16:40 -0700)]
mesa: add back-door support for cylindrical texture wrap mode

If the texture priority field is 0.125 set the PROG_PARAM_BIT_CYL_WRAP
flag.  The gallium state tracker will look for this flag.

This feature is only for testing purposes and may be remove at some
point.  But if it's useful we could write a GL/Mesa extension to
expose it properly.

14 years agogallium: Remove prefilter member from pipe_sampler_state struct.
Michal Krol [Wed, 3 Feb 2010 14:49:10 +0000 (15:49 +0100)]
gallium: Remove prefilter member from pipe_sampler_state struct.

14 years agodocs: Document TGSI Declaration token.
Michal Krol [Wed, 3 Feb 2010 14:45:32 +0000 (15:45 +0100)]
docs: Document TGSI Declaration token.

14 years agosoftpipe: Implement cylindrical wrapping for linear interpolator.
Michal Krol [Wed, 3 Feb 2010 14:30:17 +0000 (15:30 +0100)]
softpipe: Implement cylindrical wrapping for linear interpolator.

14 years agotgsi: Gather cylindrical wrap info in tgsi_shader_info struct.
Michal Krol [Wed, 3 Feb 2010 14:29:21 +0000 (15:29 +0100)]
tgsi: Gather cylindrical wrap info in tgsi_shader_info struct.

14 years agotgsi: Add ureg_DECL_fs_input_cyl().
Michal Krol [Wed, 3 Feb 2010 14:28:50 +0000 (15:28 +0100)]
tgsi: Add ureg_DECL_fs_input_cyl().

Allows one to declare fragment shader inputs with cylindrical wrap info.

14 years agogallium: Add cylindrical wrap info to TGSI declaration.
Michal Krol [Wed, 3 Feb 2010 14:28:03 +0000 (15:28 +0100)]
gallium: Add cylindrical wrap info to TGSI declaration.

14 years agotgsi: Remove tgsi_dump_c.[ch].
Michal Krol [Wed, 3 Feb 2010 10:19:04 +0000 (11:19 +0100)]
tgsi: Remove tgsi_dump_c.[ch].

Little utility after development stabilisation, use tgsi_dump instead.

14 years agomesa: Enable true refcounting for NullBufferObj.
Michal Krol [Tue, 9 Feb 2010 13:25:41 +0000 (14:25 +0100)]
mesa: Enable true refcounting for NullBufferObj.

This object can be shared with another context, so we cannot just
delete it when the owning context is being destroyed.

Ensuring that buffer objects are properly refcounted guarantees
NullBufferObj is destroyed when all references to it are removed.

14 years agomesa: Protect buffer objects reference counting with a mutex.
Michal Krol [Mon, 8 Feb 2010 18:43:42 +0000 (19:43 +0100)]
mesa: Protect buffer objects reference counting with a mutex.

14 years agomesa: Ensure object refcount is null when destroying the buffer.
José Fonseca [Mon, 1 Feb 2010 21:33:04 +0000 (21:33 +0000)]
mesa: Ensure object refcount is null when destroying the buffer.

Lets see if this is not too pedantic. Obj pointers are never exposed to
GL apps so it should be possible to get this right.

Furthermore apps with GL widgets and test suits create and destroy many
contexts and objects, so bad reference counting is not really an option.

14 years agomesa: Fix null buffer object reference counting.
José Fonseca [Mon, 1 Feb 2010 21:30:50 +0000 (21:30 +0000)]
mesa: Fix null buffer object reference counting.

Always use _mesa_reference_buffer_object, and never call
ctx->Driver.DeleteBuffer() directly to prevent dangling pointers to the
null buffer object.

This fixes crash/assertions in sharedtex_mt and Autodesk Mudbox.

14 years agomesa: Always do proper ref counting of shared state.
José Fonseca [Mon, 1 Feb 2010 21:22:10 +0000 (21:22 +0000)]
mesa: Always do proper ref counting of shared state.

14 years agosvga: Actually call fence_reference in texture downloads.
José Fonseca [Thu, 28 Jan 2010 20:51:52 +0000 (20:51 +0000)]
svga: Actually call fence_reference in texture downloads.

14 years agoprogs/xdemos: Silence uninitialized variable warning.
Vinson Lee [Tue, 9 Feb 2010 09:35:14 +0000 (01:35 -0800)]
progs/xdemos: Silence uninitialized variable warning.

14 years agor300g: Fix off-by-one errors in array bounds assertions.
Vinson Lee [Tue, 9 Feb 2010 09:26:11 +0000 (01:26 -0800)]
r300g: Fix off-by-one errors in array bounds assertions.

14 years agoscons: don't assume llvm is always present
Zack Rusin [Tue, 9 Feb 2010 05:00:35 +0000 (00:00 -0500)]
scons: don't assume llvm is always present

14 years agollvmpipe: switch to using dynamic stack allocation instead of registers
Zack Rusin [Tue, 9 Feb 2010 02:50:33 +0000 (21:50 -0500)]
llvmpipe: switch to using dynamic stack allocation instead of registers

with mutable vars we don't need to follow the phi nodes. meaning that
control flow becomes trivial as we don't have scan the rest of the tgsi
to figure out the variable usage anymore. futhermore the memory2register
pass promotes alloca/store/load to registers while inserting the right phi
nodes. so we get simplicity and performance.

14 years agoidentity: Remove unnecessary header.
Vinson Lee [Tue, 9 Feb 2010 02:22:29 +0000 (18:22 -0800)]
identity: Remove unnecessary header.

14 years agosoftpipe: Remove unnecessary headers.
Vinson Lee [Tue, 9 Feb 2010 02:14:49 +0000 (18:14 -0800)]
softpipe: Remove unnecessary headers.

14 years agogallivm: added lp_bld_misc.cpp to sources list
Brian Paul [Tue, 9 Feb 2010 00:51:48 +0000 (17:51 -0700)]
gallivm: added lp_bld_misc.cpp to sources list

14 years agollvmpipe: include gallivm/lp_bld_misc.h
Brian Paul [Tue, 9 Feb 2010 00:40:02 +0000 (17:40 -0700)]
llvmpipe: include gallivm/lp_bld_misc.h

14 years agogallivm: added gallivm/lp_bld_misc.cpp to Makefile
Brian Paul [Tue, 9 Feb 2010 00:39:08 +0000 (17:39 -0700)]
gallivm: added gallivm/lp_bld_misc.cpp to Makefile

14 years agollvmpipe: remove files moved to gallivm/ from llvmpipe/Makefile
Brian Paul [Tue, 9 Feb 2010 00:38:35 +0000 (17:38 -0700)]
llvmpipe: remove files moved to gallivm/ from llvmpipe/Makefile

14 years agollvmpipe: s/textured/texture/
Brian Paul [Tue, 9 Feb 2010 00:34:59 +0000 (17:34 -0700)]
llvmpipe: s/textured/texture/

14 years agollvmpipe: added counters for color tile clear, load, store
Brian Paul [Mon, 8 Feb 2010 20:09:18 +0000 (13:09 -0700)]
llvmpipe: added counters for color tile clear, load, store

14 years agollvmpipe: use new os time functions
Brian Paul [Mon, 8 Feb 2010 20:07:31 +0000 (13:07 -0700)]
llvmpipe: use new os time functions

14 years agoglx: Fix SwapBuffers regression introduced by 01923fb72d.
Francisco Jerez [Mon, 8 Feb 2010 22:15:03 +0000 (23:15 +0100)]
glx: Fix SwapBuffers regression introduced by 01923fb72d.

After that commit, some dri2 protocol symbols were being checked from
places that weren't including dri2proto.h, effectively disabling some
valuable SwapBuffers codepaths.

14 years agollvmpipe: export the tgsi translation code to a common layer
Zack Rusin [Mon, 8 Feb 2010 23:05:22 +0000 (18:05 -0500)]
llvmpipe: export the tgsi translation code to a common layer

the llvmpipe tgsi translation is a lot more complete than what was in
gallivm so replacing the latter with the former. this is needed since
the draw llvm paths will use the same code. effectively the proven
llvmpipe code becomes gallivm.

14 years agoradeong: Provide drm_api::destroy hook.
Corbin Simpson [Mon, 8 Feb 2010 22:03:28 +0000 (14:03 -0800)]
radeong: Provide drm_api::destroy hook.

Pedantic Corbin is pedantic.

14 years agoradeong: Always return something for create_screen.
Corbin Simpson [Mon, 8 Feb 2010 21:37:55 +0000 (13:37 -0800)]
radeong: Always return something for create_screen.

Prevents a segfault on e.g. r600.

14 years agost/dri: fix compile breakage
Keith Whitwell [Mon, 8 Feb 2010 19:45:02 +0000 (19:45 +0000)]
st/dri: fix compile breakage

14 years agoegl: re-fix context_create typo
Keith Whitwell [Mon, 8 Feb 2010 17:15:47 +0000 (17:15 +0000)]
egl: re-fix context_create typo

14 years agosvga: remove dead debug sleep
Keith Whitwell [Mon, 8 Feb 2010 17:13:15 +0000 (17:13 +0000)]
svga: remove dead debug sleep

14 years agogallium: remove softpipe references in other drivers
Keith Whitwell [Mon, 8 Feb 2010 16:35:43 +0000 (16:35 +0000)]
gallium: remove softpipe references in other drivers

14 years agodrm/radeon: remove softpipe references
Keith Whitwell [Mon, 8 Feb 2010 16:35:32 +0000 (16:35 +0000)]
drm/radeon: remove softpipe references

14 years agocell: fix the usual cell breakage
Marc Dietrich [Sat, 6 Feb 2010 14:07:48 +0000 (15:07 +0100)]
cell: fix the usual cell breakage

also update the cell config a bit

Signed-off-by: Brian Paul <brianp@vmware.com>
14 years agogallium: squash-merge of gallium screen context
Keith Whitwell [Mon, 8 Feb 2010 12:55:59 +0000 (12:55 +0000)]
gallium: squash-merge of gallium screen context

Squashed commit of the following:

commit 009598122adf5cad42bf9af067eccaf8e89e1233
Author: Christoph Bumiller <e0425955@student.tuwien.ac.at>
Date:   Mon Feb 8 11:03:26 2010 +0000

    nouveau: fix gallium-screen-context branch fallout

commit 7b2ffc2019d72e833afea7eebf3e80121187375d
Merge: 51e190e c036d13
Author: Keith Whitwell <keithw@vmware.com>
Date:   Fri Feb 5 09:55:02 2010 +0000

    Merge commit 'origin/master' into gallium-screen-context

    Conflicts:
     src/gallium/winsys/drm/nouveau/drm/nouveau_drm_api.c

    This branch has got a pretty tortured history now, I expect
    a squash merge will be appropriate when it is done.

commit 51e190e95acf120f72768fafb29e9721e358df1b
Author: Keith Whitwell <keithw@vmware.com>
Date:   Thu Feb 4 17:58:02 2010 +0000

    gallium: fix some build issues

commit f524bdaa723fb181637ad30c6ad708aeedabe25b
Merge: f906212 3aba0a2
Author: Keith Whitwell <keithw@vmware.com>
Date:   Thu Feb 4 17:51:32 2010 +0000

    Merge commit 'origin/master' into gallium-screen-context

commit f9062126883199eabf045714c717cd35f4b7b313
Author: Keith Whitwell <keithw@vmware.com>
Date:   Thu Feb 4 17:17:12 2010 +0000

    gallium/docs: small description of screen::create_context

commit efcb37bd3d5ed37f06c6105bd2d750b374ec0927
Author: Keith Whitwell <keithw@vmware.com>
Date:   Thu Feb 4 16:42:42 2010 +0000

    drm/radeon: more dead create_context wrapper removal

commit 6badc0dd9e06cf2ec936940bcf12b9ef5324b301
Author: Keith Whitwell <keithw@vmware.com>
Date:   Thu Feb 4 16:42:30 2010 +0000

    drm/i965: more dead create_context wrapper removal

commit cf04ebd5a54b18b2d894cfdab2b0f2fd55626ffc
Author: Keith Whitwell <keithw@vmware.com>
Date:   Thu Feb 4 16:42:05 2010 +0000

    st/python: more dead create_context wrapper removal

commit 444f114c3516abf71c430e6e9d0d2ae3b80679d3
Author: Keith Whitwell <keithw@vmware.com>
Date:   Thu Feb 4 16:37:58 2010 +0000

    idenity: wrapped context creation

commit 5a6d09cb9e468d1ee6c8d54b887618819d8d94f2
Author: Keith Whitwell <keithw@vmware.com>
Date:   Thu Feb 4 16:28:47 2010 +0000

    ws/gdi: remove dead context_create wrapper

commit 132b55f4bec39386ac625f09aaa11f609664024c
Author: Keith Whitwell <keithw@vmware.com>
Date:   Thu Feb 4 16:27:52 2010 +0000

    ws/gdi: remove dead context_create wrapper

commit 56d2d21a0cdcb197a364049d354c2f15a4fc026a
Author: Keith Whitwell <keithw@vmware.com>
Date:   Thu Feb 4 16:25:38 2010 +0000

    st/xorg: use screen::context_create

commit 838c5cfe56b2af6c644909bed3c5e7cdd64c336a
Author: Keith Whitwell <keithw@vmware.com>
Date:   Thu Feb 4 16:23:20 2010 +0000

    glx/xlib: simplify creation of trace-wrapped contexts

    Trace screen knows how to properly wrap context creation in the
    wrapped screen, so nothing special to do here.

commit c99404c03ebaec4175f08a2f363e43c9085f2635
Author: Keith Whitwell <keithw@vmware.com>
Date:   Thu Feb 4 16:18:24 2010 +0000

    st/python: no need to special case context creation for trace

commit 193a527a682b6877bb1faecd8092df4dfd055a18
Author: Keith Whitwell <keithw@vmware.com>
Date:   Thu Feb 4 16:15:30 2010 +0000

    drm/radeon: remove dead create_context declaration

commit bb984eecc25cf23bc77e1c818b81165ba1a07c9a
Author: Keith Whitwell <keithw@vmware.com>
Date:   Thu Feb 4 16:14:58 2010 +0000

    nv/drm: remove dead create_context ref

commit e809313a44287dc4e16c28e9e74ef3b2b5271aa1
Author: Keith Whitwell <keithw@vmware.com>
Date:   Thu Feb 4 16:12:51 2010 +0000

    st/egl: remove a layer of wrappers around screen::create_context

commit 39caa6672a04122f185c22e17aab86d1c40938bf
Author: Keith Whitwell <keithw@vmware.com>
Date:   Thu Feb 4 16:05:28 2010 +0000

    r300g: fill in screen::context_create

commit 407f12556d16ba0656774d8a1d9ebda22f82f473
Author: Keith Whitwell <keithw@vmware.com>
Date:   Thu Feb 4 16:04:04 2010 +0000

    cell: adapt for screen::create_context, untested

commit d02b0c6ce321a04c76fdabb09e0e4380ce1c1376
Author: Keith Whitwell <keithw@vmware.com>
Date:   Thu Feb 4 15:50:24 2010 +0000

    drm/nv: adapt for screen::create_context

    All contexts now created directly through the screen, so remove
    equivalent code here.

    Remove apparently un-needed array of contexts in the winsys.

commit 53eec5b1349aa1b6892a75a7bff7e7530957aeae
Author: Keith Whitwell <keithw@vmware.com>
Date:   Thu Feb 4 15:50:08 2010 +0000

    stw: adapt for screen::create_context, untested

commit c6a64de3eb381bc9a88e9fbdecbf87d77925aaf5
Author: Keith Whitwell <keithw@vmware.com>
Date:   Thu Feb 4 15:49:20 2010 +0000

    trace: expose the wrapped context's priv data

    If we are going to keep this priv idea, really want an accessor
    function for it so that trace and other drivers can wrap that.

commit 75d6104e11d86ec2b0749627ed58e35f856ee6eb
Author: Keith Whitwell <keithw@vmware.com>
Date:   Thu Feb 4 15:47:55 2010 +0000

    nv30: adapt to screen::context_create

commit 12f5deb6ed9723e9b5d34577052b8365813ca14e
Author: Keith Whitwell <keithw@vmware.com>
Date:   Thu Feb 4 15:44:47 2010 +0000

    nv40: adapt to screen::context_create

commit 14baccaa3b6bbb3b91056126f6521828e786dc62
Author: Keith Whitwell <keithw@vmware.com>
Date:   Thu Feb 4 15:35:27 2010 +0000

    nv50: adapt to screen::create_context

    Not build tested.  Need to figure out how to build nouveau.

commit a0e94505ccd2d7f3e604465a2ac302f1286b73b6
Author: Keith Whitwell <keithw@vmware.com>
Date:   Thu Feb 4 15:22:27 2010 +0000

    llvmpipe: update for screen::create_context, untested

commit 0eae17107c950346030e4f7e0ec232f868d3893d
Author: Keith Whitwell <keithw@vmware.com>
Date:   Thu Feb 4 15:16:57 2010 +0000

    xlib/llvmpipe: remove dead winsys context creation path

commit 2f69f9ffaa7e2a01d2483277246ed13051ae4ca3
Author: Keith Whitwell <keithw@vmware.com>
Date:   Thu Feb 4 14:58:27 2010 +0000

    gallium: convert most code to use screen::create_context

    I wish I could build all of gallium at once to find breakages.

commit d7b57f4061b82322cbcae176125913d9f0dea6c1
Author: Keith Whitwell <keithw@vmware.com>
Date:   Thu Feb 4 12:46:21 2010 +0000

    glx: permit building with older protocol headers

    I'd like to be able to build mesa on current distro releases without
    having to upgrade from the standard dri2proto and glproto headers.  With
    this change I'm able to build on ancient releases such as Ubuntu 9-10...

    In general, it would be nice to be able to build-test mesa to check for
    unintended breakages without having to follow the external dependencies
    of every group working on the codebase.

commit 57adedd6fb06c98572ed8d4aef19203df4c4eea2
Merge: da71847 e1906ae
Author: Keith Whitwell <keithw@vmware.com>
Date:   Thu Feb 4 11:38:15 2010 +0000

    Merge commit 'origin/master' into gallium-screen-context

    Conflicts:
     src/gallium/drivers/softpipe/sp_video_context.h
     src/gallium/drivers/trace/tr_context.c
     src/gallium/state_trackers/wgl/shared/stw_context.c
     src/gallium/winsys/gdi/gdi_softpipe_winsys.c

commit da71847ea6414d7e352c6094f8963bb4eda344dc
Author: José Fonseca <jfonseca@vmware.com>
Date:   Sat May 2 08:57:39 2009 +0100

    wgl: Use pipe_screen::context_create.

commit 2595a188f93fd903600ef5d8517737ee0592035d
Author: José Fonseca <jfonseca@vmware.com>
Date:   Sat May 2 08:56:47 2009 +0100

    trace: Implement pipe_screen::context_create.

commit f3640e4ae37a5260cbfba999d079f827de0a313a
Author: José Fonseca <jfonseca@vmware.com>
Date:   Sat May 2 08:56:17 2009 +0100

    softpipe: Implement pipe_screen::context_create.

commit 347266bddc8bd39c711bacb2193793759d0f3696
Author: José Fonseca <jfonseca@vmware.com>
Date:   Sat May 2 08:55:31 2009 +0100

    gallium: New pipe_screen::context_create callback.

14 years agoglx: permit building with older protocol headers
Keith Whitwell [Thu, 4 Feb 2010 12:46:21 +0000 (12:46 +0000)]
glx: permit building with older protocol headers

I'd like to be able to build mesa on current distro releases without
having to upgrade from the standard dri2proto and glproto headers.  With
this change I'm able to build on ancient releases such as Ubuntu 9-10...

In general, it would be nice to be able to build-test mesa to check for
unintended breakages without having to follow the external dependencies
of every group working on the codebase.

Seems to introduce no changes to the build of libglapi.a when tested against
new versions of the headers.

14 years agoprogs/demos: update .gitignore
Joakim Sindholt [Mon, 8 Feb 2010 11:33:02 +0000 (12:33 +0100)]
progs/demos: update .gitignore

14 years agoprogs/xdemos: Silence uninitialized variable warning.
Vinson Lee [Mon, 8 Feb 2010 09:53:31 +0000 (01:53 -0800)]
progs/xdemos: Silence uninitialized variable warning.

14 years agoradeon: fix UMS since stp addition.
Dave Airlie [Mon, 8 Feb 2010 07:17:34 +0000 (17:17 +1000)]
radeon: fix UMS since stp addition.

UMS doesn't need the STP atom.

Signed-off-by: Dave Airlie <airlied@redhat.com>
14 years agomesa: Fix mesa_next_pow_two to return same value if parameter is pow2.
Pauli Nieminen [Sun, 7 Feb 2010 05:36:13 +0000 (07:36 +0200)]
mesa: Fix mesa_next_pow_two to return same value if parameter is pow2.

Without subtracting one pow2 value would be rounded up to next pow2
which is not correct behaviour for the function.

14 years agor200: Fix LOD min/max emit.
Pauli Nieminen [Sun, 7 Feb 2010 04:41:12 +0000 (06:41 +0200)]
r200: Fix LOD min/max emit.

Just emit minLod and maxLod to correct reisters.

Fixes lodclamp and levelclamp test cases from piglit.

14 years agor100/r200/r300/r600: Set MaxCombinedTextureImageunits.
Pauli Nieminen [Sun, 7 Feb 2010 01:06:27 +0000 (03:06 +0200)]
r100/r200/r300/r600: Set MaxCombinedTextureImageunits.

Fixes glActiveTexture to set GL_INVALID_ENUM when trying
to activate texture unit that is not available.

piglit test case general/texunit passes now.

14 years agor200: Fix lod bias correction.
Pauli Nieminen [Sun, 7 Feb 2010 00:50:48 +0000 (02:50 +0200)]
r200: Fix lod bias correction.

glean/pointSprite shows that rv280 is trying to read from better
quality mipmap level. We have to correct default lod bias to match
required texture selection.

14 years agollvmpipe: Silence GCC 'type qualifiers ignored on function return type' warnings.
Vinson Lee [Sun, 7 Feb 2010 08:09:46 +0000 (00:09 -0800)]
llvmpipe: Silence GCC 'type qualifiers ignored on function return type' warnings.

14 years agosvga: Remove unnecessary header.
Vinson Lee [Sun, 7 Feb 2010 08:05:02 +0000 (00:05 -0800)]
svga: Remove unnecessary header.

14 years agollvmpipe: Remove unnecessary headers.
Vinson Lee [Sun, 7 Feb 2010 08:02:05 +0000 (00:02 -0800)]
llvmpipe: Remove unnecessary headers.

14 years agor300g: cleanup XXXs in the DSA state
Marek Olšák [Fri, 5 Feb 2010 23:43:23 +0000 (00:43 +0100)]
r300g: cleanup XXXs in the DSA state

14 years agor300g: make a local copy of framebuffer state
Marek Olšák [Fri, 5 Feb 2010 07:12:01 +0000 (08:12 +0100)]
r300g: make a local copy of framebuffer state

The previous more direct approach was simply incorrect.

piglit/levelclamp passes again.

14 years agor300g: fix color channel masks
Marek Olšák [Fri, 5 Feb 2010 06:07:22 +0000 (07:07 +0100)]
r300g: fix color channel masks

glean/maskedClear passes again.

14 years agor300g: remove useless GA_COLOR_CONTROL emit
Marek Olšák [Fri, 5 Feb 2010 04:55:15 +0000 (05:55 +0100)]
r300g: remove useless GA_COLOR_CONTROL emit

Already emitted in r300_emit_draw_xxx.

14 years agor300g: add L8_SRGB and A8L8_SRGB texture formats
Marek Olšák [Fri, 5 Feb 2010 04:01:14 +0000 (05:01 +0100)]
r300g: add L8_SRGB and A8L8_SRGB texture formats

14 years agor200: Add some debug output to texture function.
Pauli Nieminen [Sat, 6 Feb 2010 14:23:48 +0000 (16:23 +0200)]
r200: Add some debug output to texture function.

14 years agor300: Fix emit size prediction to know about primitive splitting.
Pauli Nieminen [Sat, 6 Feb 2010 12:47:27 +0000 (14:47 +0200)]
r300: Fix emit size prediction to know about primitive splitting.

Fixes ut2004 warnings about overflowing command buffer.

14 years agoradeon: Add some debug output to texture function.\n
Pauli Nieminen [Sat, 6 Feb 2010 11:13:18 +0000 (13:13 +0200)]
radeon: Add some debug output to texture function.\n

14 years agoradeon: Use _mesa_next_pow_two_32 instead of own implementation.
Pauli Nieminen [Sat, 6 Feb 2010 04:35:49 +0000 (06:35 +0200)]
radeon: Use _mesa_next_pow_two_32 instead of own implementation.

14 years agomesa/main: Add function to find next higher power of two.
Pauli Nieminen [Sat, 6 Feb 2010 04:32:40 +0000 (06:32 +0200)]
mesa/main: Add function to find next higher power of two.

With gcc implementation uses __builtin_clr which counts number of
leading zeros.

Fallback implementation uses bit manipulation. First it duplicates
the highest bit to all lower bits and then adds one to get the power
of two number.

14 years agoradeon: Add some debug output to miptree code.
Pauli Nieminen [Sat, 6 Feb 2010 03:12:44 +0000 (05:12 +0200)]
radeon: Add some debug output to miptree code.

14 years agoradeon: Remove the loop from stride size calculation.
Pauli Nieminen [Sat, 6 Feb 2010 01:01:57 +0000 (03:01 +0200)]
radeon: Remove the loop from stride size calculation.

Changed stride size calculation to do the math by rounding
the value instead of loop. r600 minimum stride is 256 which
might might cause up to about 60 rounds of the loop.

14 years agoGallium: Add Solaris atomic function definitions to u_atomic.h
Alan Coopersmith [Sat, 6 Feb 2010 03:36:42 +0000 (19:36 -0800)]
Gallium: Add Solaris atomic function definitions to u_atomic.h

Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
14 years agointel: Allow L8 PBO blit uploads.
Damien Lespiau [Sat, 6 Feb 2010 15:43:01 +0000 (16:43 +0100)]
intel: Allow L8 PBO blit uploads.

Bug #32810

14 years agoi965: Keep the CURBE BO mapped and memcpy instead of subdataing.
Eric Anholt [Fri, 5 Feb 2010 15:08:51 +0000 (07:08 -0800)]
i965: Keep the CURBE BO mapped and memcpy instead of subdataing.

For the tiny bis of data we generally upload through the CURBEs, the
overhead of the kernel's pagetable trickery is actually rather high.
This improves cairo-gl gnome-terminal-vim performance by 3.8%.

14 years agoi965: Reset the "need new CURBE BO" flag when we make a new CURBE bo.
Eric Anholt [Fri, 5 Feb 2010 14:55:20 +0000 (06:55 -0800)]
i965: Reset the "need new CURBE BO" flag when we make a new CURBE bo.

Improves cairo-gl gnome-terminal-vim times by 11%.

14 years agointel: Check aperture size when doing a blit glClear.
Eric Anholt [Fri, 5 Feb 2010 09:03:35 +0000 (01:03 -0800)]
intel: Check aperture size when doing a blit glClear.

Fixes failure in cairo-gl firefox-planet-gnome.

14 years agointel: Allow PBO acceleration for GL_RGBA8 MESA_FORMAT_ARGB8888.
Eric Anholt [Fri, 5 Feb 2010 08:34:14 +0000 (00:34 -0800)]
intel: Allow PBO acceleration for GL_RGBA8 MESA_FORMAT_ARGB8888.

This improves firefox-talos-svg runtimes on cairo-gl by 14%.

14 years agollvmpipe: Silence GCC 'no previous prototype' warning.
Vinson Lee [Sat, 6 Feb 2010 08:48:18 +0000 (00:48 -0800)]
llvmpipe: Silence GCC 'no previous prototype' warning.

14 years agoi965g: Remove unnecessary headers.
Vinson Lee [Sat, 6 Feb 2010 07:39:34 +0000 (23:39 -0800)]
i965g: Remove unnecessary headers.

14 years agoeglplatform.h: recognize __unix as well for Solaris & other SVR4 platforms
Alan Coopersmith [Fri, 5 Feb 2010 02:20:09 +0000 (18:20 -0800)]
eglplatform.h: recognize __unix as well for Solaris & other SVR4 platforms

Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
14 years agogallium/python: support two more formats in retrace dumps
Zack Rusin [Sat, 6 Feb 2010 00:04:11 +0000 (19:04 -0500)]
gallium/python: support two more formats in retrace dumps

dump PIPE_FORMAT_R8G8B8A8_UNORM and PIPE_FORMAT_R16G16B16_SNORM formats.

14 years agost/mesa: allow negative index for PROGRAM_STATE_VAR
Brian Paul [Fri, 5 Feb 2010 21:59:04 +0000 (14:59 -0700)]
st/mesa: allow negative index for PROGRAM_STATE_VAR

The piglit vp-address-01 test uses negative address-relative
offsets.  In this test we're indexing into PROGRAM_STATE_VAR
which, in turn, contains references to ENV vars.

We previously fixed this issue for PROGRAM_CONSTANT.

piglit/vp-address-01 (the version from Feb 5) passes now.

(cherry picked from commit 64be837b0b171c44f47a3c0b83f566d292ffff50)

14 years agomesa: debug output for ARL
Brian Paul [Fri, 5 Feb 2010 21:58:46 +0000 (14:58 -0700)]
mesa: debug output for ARL

14 years agodocs: Fix a typo in mesa3d.org HTML.
Brian Paul [Fri, 5 Feb 2010 20:18:31 +0000 (13:18 -0700)]
docs: Fix a typo in mesa3d.org HTML.

Signed-off-by: Brian Paul <brianp@vmware.com>
(cherry picked from commit e6ee4b49c48ec7c2e7df2cff7b253b01e88e7101)

14 years agoosmesa: Add OSMesaColorClamp and OSMesaGetProcAddress to symbol defs.
Brian Paul [Fri, 5 Feb 2010 20:18:18 +0000 (13:18 -0700)]
osmesa: Add OSMesaColorClamp and OSMesaGetProcAddress to symbol defs.

Without this patch, the two symbols get an underscore prepended
and an "@4" appended when compiling with VC8.

Signed-off-by: Brian Paul <brianp@vmware.com>
(cherry picked from commit e65029e9b32ddabea0ec583c04484345b40f1557)