mesa.git
14 years agoauxiliary: fix u_split_prim naming convention
Luca Barbieri [Wed, 11 Aug 2010 08:51:28 +0000 (10:51 +0200)]
auxiliary: fix u_split_prim naming convention

Current practice is to start identifiers with "util_" instead of "u_".

14 years agoauxiliary: move Ben Skeggs' primitive splitter to common code
Luca Barbieri [Wed, 11 Aug 2010 08:46:12 +0000 (10:46 +0200)]
auxiliary: move Ben Skeggs' primitive splitter to common code

This is a simple framework that handles splitting primitives in an
abstract way.

The user has to specify the primitive start, start index and count.

Then, it can ask the primitive splitter to "draw" a chunk of the
primitive, staying under a given vertex/index budget.

The primitive splitter will then call user-supplied functions to
emit a range of vertices/indices, as well as switch the edgeflag
on or off.

This is particularly useful for hardware that either has limits
on the vertex count field, or where vertices are pushed on a FIFO
or temporary buffer of limited size.

Note that unlike other splitters, it does not manipulate data in
any way, and merely asks a callback to do so, in vertex intervals.

14 years agomesa: Include missing header in prog_noise.h.
Vinson Lee [Wed, 11 Aug 2010 08:10:54 +0000 (01:10 -0700)]
mesa: Include missing header in prog_noise.h.

Include glheader.h for GLfloat symbol.

14 years agomesa: Clean up header file inclusion in prog_instruction.h.
Vinson Lee [Wed, 11 Aug 2010 08:05:49 +0000 (01:05 -0700)]
mesa: Clean up header file inclusion in prog_instruction.h.

Remove mfeatures.h.
Include glheader.h for GL symbols.

14 years agomesa: Include missing header in prog_execute.h.
Vinson Lee [Wed, 11 Aug 2010 07:43:28 +0000 (00:43 -0700)]
mesa: Include missing header in prog_execute.h.

Include mtypes.h for GLcontext symbol.

14 years agomesa: Include missing header in prog_cache.h.
Vinson Lee [Wed, 11 Aug 2010 07:35:34 +0000 (00:35 -0700)]
mesa: Include missing header in prog_cache.h.

Include mtypes.h for GLcontext symbol.

14 years agomesa: Include missing header in nvvertparse.h.
Vinson Lee [Wed, 11 Aug 2010 07:33:02 +0000 (00:33 -0700)]
mesa: Include missing header in nvvertparse.h.

Include mtypes.h for GLcontext symbol.

14 years agomesa: Include missing header in nvfragparse.h.
Vinson Lee [Wed, 11 Aug 2010 07:29:26 +0000 (00:29 -0700)]
mesa: Include missing header in nvfragparse.h.

Include mtypes.h for GLcontext symbol.

14 years agomesa: Remove unnecessary header from hash_table.h.
Vinson Lee [Wed, 11 Aug 2010 07:26:05 +0000 (00:26 -0700)]
mesa: Remove unnecessary header from hash_table.h.

14 years agoswrast: fix span color array pointer assignment for 32-bit/channel rendering
M.Froehlich@science-computing.de [Wed, 11 Aug 2010 03:19:46 +0000 (21:19 -0600)]
swrast: fix span color array pointer assignment for 32-bit/channel rendering

See fd.o bug 29487.

NOTE: This is a candidate for the 7.8 branch.

Signed-off-by: Brian Paul <brianp@vmware.com>
14 years agor300g: initialize VAP_VTX_STATE_CNTL
Marek Olšák [Wed, 11 Aug 2010 00:58:50 +0000 (02:58 +0200)]
r300g: initialize VAP_VTX_STATE_CNTL

This got lost during the rasterizer rewrite.

14 years agor300g: implement gl_FrontFacing
Marek Olšák [Tue, 10 Aug 2010 12:21:05 +0000 (14:21 +0200)]
r300g: implement gl_FrontFacing

14 years agoswrast: Remove unnecessary header.
Vinson Lee [Wed, 11 Aug 2010 01:05:52 +0000 (18:05 -0700)]
swrast: Remove unnecessary header.

14 years agosvga: Remove unnecessary headers.
Vinson Lee [Wed, 11 Aug 2010 00:53:08 +0000 (17:53 -0700)]
svga: Remove unnecessary headers.

14 years agor300g: Remove unnecessary header.
Vinson Lee [Wed, 11 Aug 2010 00:39:13 +0000 (17:39 -0700)]
r300g: Remove unnecessary header.

14 years agoglut: also check for GLX_ARB_multisample
Nigel Stewart [Tue, 10 Aug 2010 23:27:37 +0000 (17:27 -0600)]
glut: also check for GLX_ARB_multisample

Signed-off-by: Brian Paul <brianp@vmware.com>
14 years agomesa: use switch stmt in init_program_limits()
Brian Paul [Tue, 10 Aug 2010 15:14:22 +0000 (09:14 -0600)]
mesa: use switch stmt in init_program_limits()

14 years agomesa: remove obsolete comments
Brian Paul [Tue, 10 Aug 2010 15:10:30 +0000 (09:10 -0600)]
mesa: remove obsolete comments

14 years agor300/compiler: Use predicate bit for IF statements in r500 vertex shaders
Tom Stellard [Sun, 8 Aug 2010 19:53:29 +0000 (12:53 -0700)]
r300/compiler: Use predicate bit for IF statements in r500 vertex shaders

14 years agor300/compiler: Implement hardware assisted loops for vertex shaders.
Tom Stellard [Thu, 5 Aug 2010 17:19:00 +0000 (10:19 -0700)]
r300/compiler: Implement hardware assisted loops for vertex shaders.

Single loops work, but nested loops do not.

14 years agor300/compiler: Correctly transform nested loops.
Tom Stellard [Fri, 6 Aug 2010 04:03:55 +0000 (21:03 -0700)]
r300/compiler: Correctly transform nested loops.

14 years agor600g: avoid reemiting literal, avoid scheduling empty cs
Jerome Glisse [Tue, 10 Aug 2010 15:52:00 +0000 (11:52 -0400)]
r600g: avoid reemiting literal, avoid scheduling empty cs

Signed-off-by: Jerome Glisse <jglisse@redhat.com>
14 years agoutil: Add util_format_srgb().
José Fonseca [Tue, 10 Aug 2010 15:32:29 +0000 (16:32 +0100)]
util: Add util_format_srgb().

To convert RGB -> SRGB format.

14 years agogallivm: fix non-SSE4.1 case in lp_build_pack2()
Brian Paul [Tue, 10 Aug 2010 14:56:20 +0000 (08:56 -0600)]
gallivm: fix non-SSE4.1 case in lp_build_pack2()

Since there's no SSE instruction for this case, fall through to the
generic shuffle code.

Fixes bug fd.o 29468.

14 years agomesa: additional program limit assertions
Brian Paul [Tue, 10 Aug 2010 14:38:12 +0000 (08:38 -0600)]
mesa: additional program limit assertions

14 years agomesa: fix comment typo
Brian Paul [Tue, 10 Aug 2010 14:35:47 +0000 (08:35 -0600)]
mesa: fix comment typo

14 years agogallivm: Fix bitwise operations for floats, division for integers
nobled [Mon, 9 Aug 2010 21:25:18 +0000 (21:25 +0000)]
gallivm: Fix bitwise operations for floats, division for integers

http://bugs.freedesktop.org/29407

Signed-off-by: José Fonseca <jfonseca@vmware.com>
14 years agogallivm: Even more type checking
nobled [Mon, 9 Aug 2010 21:15:08 +0000 (21:15 +0000)]
gallivm: Even more type checking

http://bugs.freedesktop.org/29407

Signed-off-by: José Fonseca <jfonseca@vmware.com>
14 years agollvmpipe: Always use floating-point operators for floating-point types
nobled [Fri, 6 Aug 2010 17:32:29 +0000 (17:32 +0000)]
llvmpipe: Always use floating-point operators for floating-point types

See:
http://bugs.freedesktop.org/29404
http://bugs.freedesktop.org/29407

Signed-off-by: José Fonseca <jfonseca@vmware.com>
14 years agoradeon: Use MESA_FORMAT_SARGB8 for sRGB formats
Henri Verbeet [Mon, 9 Aug 2010 19:06:02 +0000 (15:06 -0400)]
radeon: Use MESA_FORMAT_SARGB8 for sRGB formats

This can be supported on r600 without using the endian swapper, and is a
better fit for (typical) uploads using GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV
anyway.

14 years agor600c: Disable alpha test during blits
Henri Verbeet [Mon, 9 Aug 2010 19:03:27 +0000 (15:03 -0400)]
r600c: Disable alpha test during blits

14 years agogallivm: More type checks.
José Fonseca [Mon, 9 Aug 2010 16:30:33 +0000 (17:30 +0100)]
gallivm: More type checks.

14 years agogallivm: Don't call LLVMBuildFNeg on llvm-2.6.
José Fonseca [Mon, 9 Aug 2010 16:26:18 +0000 (17:26 +0100)]
gallivm: Don't call LLVMBuildFNeg on llvm-2.6.

It didn't exist yet.

14 years agogallivm: Always use floating-point operators for floating-point types
nobled [Sun, 8 Aug 2010 19:44:54 +0000 (19:44 +0000)]
gallivm: Always use floating-point operators for floating-point types

This fixes the assert added in LLVM 2.8:
assert(getType()->isIntOrIntVectorTy() &&
       "Tried to create an integer operation on a non-integer type!")

But it also fixes some subtle bugs, since we should've been doing this
since LLVM 2.6 anyway.

Includes a modified patch from steckdenis@yahoo.fr for the
FNeg instructions in emit_fetch(); thanks for pointing those out.

http://bugs.freedesktop.org/29404
http://bugs.freedesktop.org/29407

Signed-off-by: José Fonseca <jfonseca@vmware.com>
14 years agoutil: Move _mm_shuffle_epi8() to u_sse.h.
José Fonseca [Mon, 9 Aug 2010 15:41:44 +0000 (16:41 +0100)]
util: Move _mm_shuffle_epi8() to u_sse.h.

It's bound to be useful elsewhere.

14 years agor600g: fix r600 context structure, avoid segfault when no scissor
Jerome Glisse [Mon, 9 Aug 2010 15:32:45 +0000 (11:32 -0400)]
r600g: fix r600 context structure, avoid segfault when no scissor

Signed-off-by: Jerome Glisse <jglisse@redhat.com>
14 years agor300g: do not print shader compiler errors by default
Marek Olšák [Mon, 9 Aug 2010 15:15:37 +0000 (17:15 +0200)]
r300g: do not print shader compiler errors by default

14 years agor600g: fix some warnings
Marek Olšák [Mon, 9 Aug 2010 12:57:56 +0000 (14:57 +0200)]
r600g: fix some warnings

14 years agor600g: fill out some missing caps and sort them
Marek Olšák [Mon, 9 Aug 2010 12:53:58 +0000 (14:53 +0200)]
r600g: fill out some missing caps and sort them

The shader caps need additional corrections.

(based on a patch from netkas at Phoronix)

14 years agoradeon: fix npot mipmap alignment on r600
Andre Maasikas [Mon, 9 Aug 2010 11:37:01 +0000 (14:37 +0300)]
radeon: fix npot mipmap alignment on r600

seems it got lost in commit 0d383547
have no earlier radeons to test, but npot mipmaps were not supported there?

14 years agor600: bump glsl version
Andre Maasikas [Mon, 9 Aug 2010 11:28:00 +0000 (14:28 +0300)]
r600: bump glsl version

from the tests i couldn't find any new driver faults

14 years agor300g: fix hiz/zmask offset emissions.
Dave Airlie [Mon, 9 Aug 2010 09:56:45 +0000 (19:56 +1000)]
r300g: fix hiz/zmask offset emissions.

ofs is in dwords, so need to shift it for registers.

Signed-off-by: Dave Airlie <airlied@redhat.com>
14 years agonouveau: fix maps with PIPE_TRANSFER_UNSYNCHRONIZED | PIPE_TRANSFER_DONTBLOCK
Luca Barbieri [Mon, 9 Aug 2010 02:56:03 +0000 (04:56 +0200)]
nouveau: fix maps with PIPE_TRANSFER_UNSYNCHRONIZED | PIPE_TRANSFER_DONTBLOCK

In this case, we were incorrectly prioritizing PIPE_TRANSFER_DONTBLOCK over
PIPE_TRANSFER_UNSYNCHRONIZED.

This can lead to failure in the Mesa VBO draw paths that end up specifying
both, but don't expect map to fail (in particular, the problem manifested as
a leak of buffer objects in teapot with other changes).

14 years agor300g: remove a flush
Marek Olšák [Sun, 8 Aug 2010 21:09:46 +0000 (23:09 +0200)]
r300g: remove a flush

Ooops, it wasn't supposed to be there.

14 years agogallivm: Fix more integer operations.
José Fonseca [Sun, 8 Aug 2010 21:18:53 +0000 (22:18 +0100)]
gallivm: Fix more integer operations.

14 years agogallivm: Use the correct context for integers
nobled [Sun, 8 Aug 2010 20:17:30 +0000 (20:17 +0000)]
gallivm: Use the correct context for integers

See:
http://bugs.freedesktop.org/29407

14 years agor300g: flush zmasks of zbuffers we are going to use as samplers
Marek Olšák [Sun, 8 Aug 2010 16:43:42 +0000 (18:43 +0200)]
r300g: flush zmasks of zbuffers we are going to use as samplers

It sometimes works, sometimes not. I guess we have the zmask offsets wrong.

14 years agor300g: do not allocate a zmask block for 3D textures and cubemaps
Marek Olšák [Sun, 8 Aug 2010 16:21:53 +0000 (18:21 +0200)]
r300g: do not allocate a zmask block for 3D textures and cubemaps

14 years agor300g: generalize the way we ask for hyperz
Marek Olšák [Sat, 7 Aug 2010 00:05:03 +0000 (02:05 +0200)]
r300g: generalize the way we ask for hyperz

This makes it compatible with the modified DRM interface in drm-radeon-testing.

Also, now you need to set RADEON_HYPERZ=1 to be able to use hyperz.
It's not bug-free yet.

14 years agogallivm: Add type checks for the basic operations.
José Fonseca [Sun, 8 Aug 2010 20:02:59 +0000 (21:02 +0100)]
gallivm: Add type checks for the basic operations.

14 years agodraw: Remove unused variable.
José Fonseca [Sun, 8 Aug 2010 12:58:23 +0000 (13:58 +0100)]
draw: Remove unused variable.

14 years agodraw: Use the correct type for integers
nobled [Fri, 6 Aug 2010 17:36:41 +0000 (17:36 +0000)]
draw: Use the correct type for integers

Two integers were being operated on as
a vector of floats in draw_llvm_generate().

This bug got uncovered by fixing this bug:
http://bugs.freedesktop.org/29407

14 years agor300g: take hiz/zmask offsets into a/c when clearing.
Dave Airlie [Sun, 8 Aug 2010 09:12:14 +0000 (19:12 +1000)]
r300g: take hiz/zmask offsets into a/c when clearing.

Need to add a test for multi-hiz/zmask db in a single context.

Signed-off-by: Dave Airlie <airlied@redhat.com>
14 years agoi810: Add missing header m_xform.h.
Vinson Lee [Sun, 8 Aug 2010 06:38:20 +0000 (23:38 -0700)]
i810: Add missing header m_xform.h.

This is another follow-up to commit
f4511c4835879090ce7e6afe3ac26b98fb91899a.

14 years agodri: Add missing header m_xform.h.
Vinson Lee [Sun, 8 Aug 2010 06:19:27 +0000 (23:19 -0700)]
dri: Add missing header m_xform.h.

This is a follow-up patch to commit
f4511c4835879090ce7e6afe3ac26b98fb91899a.

Files that include tnl_dd/t_dd_dmatmp.h now need to also include
m_xform.h as t_context.h no longer includes it.

14 years agotnl: Reduce header file inclusion in t_context.h.
Vinson Lee [Sun, 8 Aug 2010 05:56:35 +0000 (22:56 -0700)]
tnl: Reduce header file inclusion in t_context.h.

t_context.h
Remove m_matrix.h and m_xform.h.

t_vb_program.c
Include m_xform.h.

t_vb_render.c
Include m_xform.h.

14 years agoswrast: Reduce header file inclusion in s_zoom.h.
Vinson Lee [Sun, 8 Aug 2010 05:13:19 +0000 (22:13 -0700)]
swrast: Reduce header file inclusion in s_zoom.h.

Include mtypes.h for GLcontext symbol.
Include s_span.h for SWspan symbol.

14 years agoswrast: Fix header file inclusion in s_texfilter.h.
Vinson Lee [Sun, 8 Aug 2010 05:05:28 +0000 (22:05 -0700)]
swrast: Fix header file inclusion in s_texfilter.h.

Include mtypes.h for GLcontext symbol.
Include s_context.h for texture_sample_func symbol.

14 years agoswrast: Reduce header file inclusion in s_texcombine.h.
Vinson Lee [Sun, 8 Aug 2010 05:01:27 +0000 (22:01 -0700)]
swrast: Reduce header file inclusion in s_texcombine.h.

Include mtypes.h for GLcontext sybmol.
Include s_span.h for SWspan symbol.

14 years agoswrast: Reduce header file inclusion in s_stencil.h.
Vinson Lee [Sun, 8 Aug 2010 04:44:53 +0000 (21:44 -0700)]
swrast: Reduce header file inclusion in s_stencil.h.

Include mtypes.h for GLcontext symbol.
Include s_span.h for SWspan symbol.

14 years agoswrast: Reduce header file inclusion in s_masking.h.
Vinson Lee [Sun, 8 Aug 2010 04:24:16 +0000 (21:24 -0700)]
swrast: Reduce header file inclusion in s_masking.h.

Include mtypes.h for GLcontext symbol.
Include s_span.h for SWspan symbol.

14 years agoswrast: Reduce header file inclusion in s_logic.h.
Vinson Lee [Sun, 8 Aug 2010 04:07:11 +0000 (21:07 -0700)]
swrast: Reduce header file inclusion in s_logic.h.

Include mtypes.h for GLcontext symbol.
Include s_span.h for SWspan symbol.

14 years agoswrast: Reduce header file inclusion in s_fragprog.h.
Vinson Lee [Sun, 8 Aug 2010 04:01:12 +0000 (21:01 -0700)]
swrast: Reduce header file inclusion in s_fragprog.h.

s_fragprog.h
Include mtype.h for GLcontext symbol.
Include s_span.h for SWspan symbol.

s_fragprog.c
Include s_context.h now that it is removed from s_fragprog.h.

14 years agoswrast: Reduce header file inclusion in s_fog.h.
Vinson Lee [Sat, 7 Aug 2010 20:57:50 +0000 (13:57 -0700)]
swrast: Reduce header file inclusion in s_fog.h.

Include mtypes.h for GLcontext symbol.
Include s_span.h for SWspan symbol.

14 years agoswrast: Clean up header file inclusion in s_depth.h.
Vinson Lee [Sat, 7 Aug 2010 20:04:50 +0000 (13:04 -0700)]
swrast: Clean up header file inclusion in s_depth.h.

Include mtypes.h for GLcontext symbol.
Include s_span.h for SWspan symbol.

14 years agoswrast: Include missing header in s_context.h.
Vinson Lee [Sat, 7 Aug 2010 19:44:58 +0000 (12:44 -0700)]
swrast: Include missing header in s_context.h.

Include compiler.h for _ASMAPIP symbol.

14 years agoswrast: Clean up header file inclusion in s_blend.h.
Vinson Lee [Sat, 7 Aug 2010 19:36:50 +0000 (12:36 -0700)]
swrast: Clean up header file inclusion in s_blend.h.

Include mtypes.h for GLcontext symbol.
Include s_span.h for SWspan symbol.

14 years agoswrast: Clean up header file inclusion in s_atifragshader.h.
Vinson Lee [Sat, 7 Aug 2010 19:25:20 +0000 (12:25 -0700)]
swrast: Clean up header file inclusion in s_atifragshader.h.

s_atifragshader.h
Include mtypes.h for GLcontext symbol.
Include s_span.h for SWspan symbol.

s_atifragshader.c
Include s_context.h for SWcontext symbol.

14 years agoswrast: Clean up header file inclusion in s_alpha.h.
Vinson Lee [Sat, 7 Aug 2010 19:19:29 +0000 (12:19 -0700)]
swrast: Clean up header file inclusion in s_alpha.h.

Include mtypes.h for GLcontext symbol.
Include s_span.h for SWspan symbol.

14 years agor300c: do not advertise half float vertex on RV3xx, RS4xx, RC4xx
Marek Olšák [Sat, 7 Aug 2010 16:10:07 +0000 (18:10 +0200)]
r300c: do not advertise half float vertex on RV3xx, RS4xx, RC4xx

Fixes a hardlock.

NOTE: this is a candidate for the 7.8 branch, provided the half float vertex
is really implemented there.

14 years agost/mesa: Remove unnecessary header.
Vinson Lee [Sat, 7 Aug 2010 01:45:15 +0000 (18:45 -0700)]
st/mesa: Remove unnecessary header.

14 years agor300g: fix cbzb clears when hyperz is off
Marek Olšák [Fri, 6 Aug 2010 23:59:31 +0000 (01:59 +0200)]
r300g: fix cbzb clears when hyperz is off

14 years agonouveau: fix potential NULL-ptr dereference in nouveau_stateobj.h
Maarten Maathuis [Fri, 6 Aug 2010 21:56:31 +0000 (23:56 +0200)]
nouveau: fix potential NULL-ptr dereference in nouveau_stateobj.h

- This can only be triggered when DEBUG_NOUVEAU_STATEOBJ is active.
- Also remove a redundant pointer assignment.

Reported-by: Roy Spliet <r.spliet@student.tudelft.nl>
Signed-off-by: Maarten Maathuis <madman2003@gmail.com>
14 years agor600g: add PA_CL_CLIP_CNTL definition
Jerome Glisse [Fri, 6 Aug 2010 21:27:36 +0000 (17:27 -0400)]
r600g: add PA_CL_CLIP_CNTL definition

Signed-off-by: Jerome Glisse <jglisse@redhat.com>
14 years agor600g: fix rendering, only enable target we write too
Jerome Glisse [Fri, 6 Aug 2010 21:22:45 +0000 (17:22 -0400)]
r600g: fix rendering, only enable target we write too

Signed-off-by: Jerome Glisse <jglisse@redhat.com>
14 years agor600g: really fix multi target support
Jerome Glisse [Fri, 6 Aug 2010 21:12:37 +0000 (17:12 -0400)]
r600g: really fix multi target support

Signed-off-by: Jerome Glisse <jglisse@redhat.com>
14 years agost/mesa: remove stray semicolons
Brian Paul [Fri, 6 Aug 2010 21:09:51 +0000 (15:09 -0600)]
st/mesa: remove stray semicolons

14 years agogallium: remove stray semicolons
Brian Paul [Fri, 6 Aug 2010 21:09:41 +0000 (15:09 -0600)]
gallium: remove stray semicolons

14 years agor600g: finish multi target rendering support
Jerome Glisse [Fri, 6 Aug 2010 20:10:25 +0000 (16:10 -0400)]
r600g: finish multi target rendering support

Signed-off-by: Jerome Glisse <jglisse@redhat.com>
14 years agotargets/egl: Fix build by including missing headers.
Vinson Lee [Fri, 6 Aug 2010 18:45:52 +0000 (11:45 -0700)]
targets/egl: Fix build by including missing headers.

14 years agodraw: Add an assertion to varray's version of trim().
Chia-I Wu [Fri, 6 Aug 2010 16:50:32 +0000 (00:50 +0800)]
draw: Add an assertion to varray's version of trim().

Assert that "first" is always smaller than "count" and add reasoning.
It would be better to simply fix trim(), but it is used in tight loops
right now.

14 years agodraw: Fix draw_pt_split_prim for primitives with adjacency.
Chia-I Wu [Fri, 6 Aug 2010 14:50:09 +0000 (22:50 +0800)]
draw: Fix draw_pt_split_prim for primitives with adjacency.

Some primitives with adjacency have their "incr" wrong.

14 years agodraw: Assert that only the first vetex may have flags set.
Chia-I Wu [Sat, 7 Aug 2010 08:14:50 +0000 (02:14 -0600)]
draw: Assert that only the first vetex may have flags set.

642d5ba79abc6a231a5fdabb3454b9b082b0d7f8 removed flags masking for
vertices other than the first one.  Add assertions to be on the safe
side.

14 years agor600g: fix color format, indentation, defines
Jerome Glisse [Fri, 6 Aug 2010 15:28:33 +0000 (11:28 -0400)]
r600g: fix color format, indentation, defines

Signed-off-by: Jerome Glisse <jglisse@redhat.com>
14 years agoRevert "r600g: don't use dynamic state allocation for states"
Jerome Glisse [Fri, 6 Aug 2010 14:59:27 +0000 (10:59 -0400)]
Revert "r600g: don't use dynamic state allocation for states"

This reverts commit 9c949d4a4dd43b7889e13bdf683bcf211f049ced.

Conflicts:

src/gallium/drivers/r600/r600_context.h
src/gallium/drivers/r600/r600_draw.c
src/gallium/drivers/r600/r600_shader.c
src/gallium/drivers/r600/r600_state.c

14 years agodraw: Avoid mixed declarations and code.
Chia-I Wu [Fri, 6 Aug 2010 08:57:04 +0000 (16:57 +0800)]
draw: Avoid mixed declarations and code.

Do not expand LOCAL_VARS to void expression.  Otherwise, declarations
and code will be mixed when more variables are declared in FUNC_ENTER.

This fixes fdo bug #29416.

14 years agoswrast: Reduce header file inclusion in s_aatriangle.h.
Vinson Lee [Fri, 6 Aug 2010 08:04:19 +0000 (01:04 -0700)]
swrast: Reduce header file inclusion in s_aatriangle.h.

Include mtypes.h for GLcontext symbol.

14 years agoswrast: Reduce header file inclusion in s_aaline.h.
Vinson Lee [Fri, 6 Aug 2010 07:57:52 +0000 (00:57 -0700)]
swrast: Reduce header file inclusion in s_aaline.h.

Include mtypes.h for GLcontext symbol.

14 years agor300g: Remove unnecessary headers.
Vinson Lee [Fri, 6 Aug 2010 06:58:00 +0000 (23:58 -0700)]
r300g: Remove unnecessary headers.

14 years agor600g: start to fix up multiple targets.
Dave Airlie [Fri, 6 Aug 2010 05:29:50 +0000 (15:29 +1000)]
r600g: start to fix up multiple targets.

fixup exports from pixel shader for multi-cbs + depth buffer writing.

Still crashes GPU running any of the multi-buffer or depth writing

14 years agodraw: Remove unnecessary vertex flag ANDs.
Chia-I Wu [Wed, 4 Aug 2010 06:37:40 +0000 (14:37 +0800)]
draw: Remove unnecessary vertex flag ANDs.

Vertex flags are a contract between vcache and the pipeline.  They are
set only for the first vertex of a primitive.

14 years agodraw: Mask out vertex flags in GS and stream output.
Chia-I Wu [Wed, 4 Aug 2010 06:39:16 +0000 (14:39 +0800)]
draw: Mask out vertex flags in GS and stream output.

This fixes out-of-bound access to the vertices.

14 years agodraw: Include draw_decompose_tmp.h in draw_pt_decompose.h.
Chia-I Wu [Sun, 1 Aug 2010 17:38:58 +0000 (01:38 +0800)]
draw: Include draw_decompose_tmp.h in draw_pt_decompose.h.

Use draw_decompose_tmp.h to replace pipeline primitive decomposer.

14 years agodraw: Include draw_decompose_tmp.h in draw_so_emit_tmp.h.
Chia-I Wu [Sun, 1 Aug 2010 17:38:58 +0000 (01:38 +0800)]
draw: Include draw_decompose_tmp.h in draw_so_emit_tmp.h.

Use draw_decompose_tmp.h to replace stream out primitive decomposer.

14 years agodraw: Include draw_decompose_tmp.h in draw_gs_tmp.h.
Chia-I Wu [Sun, 1 Aug 2010 17:38:58 +0000 (01:38 +0800)]
draw: Include draw_decompose_tmp.h in draw_gs_tmp.h.

Use draw_decompose_tmp.h to replace GS primitive decomposer.

14 years agodraw: Include draw_decompose_tmp.h in draw_pt_vcache_tmp.h.
Chia-I Wu [Sun, 1 Aug 2010 17:21:08 +0000 (01:21 +0800)]
draw: Include draw_decompose_tmp.h in draw_pt_vcache_tmp.h.

Use draw_decompose_tmp.h to replace vcache primitive decomposer.  As the
new decomposer supports primitives with adjacency, vcache_triangle_adj
and vcache_line_adj (and their variants that have flags) are added.

14 years agodraw: Add draw_decompose_tmp.h.
Chia-I Wu [Sun, 1 Aug 2010 13:29:36 +0000 (21:29 +0800)]
draw: Add draw_decompose_tmp.h.

Including draw_decompose_tmp.h defines a primitive decomposer.  It is
intended to replace the existing vcache/so/gs/pipe decomposers.

This is based on draw_pt_vcache_tmp.h.

14 years agor600g: add SRGB support.
Dave Airlie [Fri, 6 Aug 2010 05:21:44 +0000 (15:21 +1000)]
r600g: add SRGB support.

This enables GL2.1 and passes glean's texture_srgb test.

14 years agor600g: fixup z format translations.
Dave Airlie [Fri, 6 Aug 2010 05:06:25 +0000 (15:06 +1000)]
r600g: fixup z format translations.

this enables GL_EXT_packed_depth_stencil. fbo-d24s8 passes

14 years agor600g: fix targetmask to work correctly.
Dave Airlie [Fri, 6 Aug 2010 04:54:24 +0000 (14:54 +1000)]
r600g: fix targetmask to work correctly.

At least this seems to fix the glean maskedClear test.