Commit graph

22853 commits

Author SHA1 Message Date
Robert Ellison
0ccbc3c905 Fix an i965 assertion failure on glClear()
While running conform with render-to-texture:

	conform -d 33 -v 2 -t -direct

the i965 driver failed this assertion:

intel_clear.c:77: intel_clear_tris: Assertion `(mask & ~((1 << BUFFER_BACK_LEFT) | (1 << BUFFER_FRONT_LEFT) | (1 << BUFFER_DEPTH) | (1 << BUFFER_STENCIL))) == 0' failed.

The problem is that intel_clear_tris() is called by intelClear() to
clear any and all of the available color buffers, but intel_clear_tris()
actually only handles the back left and front left color buffers; so
the assertion fails as soon as you try to clear a non-standard color
buffer.

The fix is to have intelClear() only call intel_clear_tris() with
buffers that intel_clear_tris() can support.  intelClear() already backs
down to _swrast_Clear() for all buffers that aren't handled explicitly.
2009-02-11 18:05:19 -07:00
Dan Nicholson
8217f24f21 autoconf: Fix lib globbing for static builds
Reported-by: Siddhartha Chaudhuri <expiring_frog@yahoo.co.uk>
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
2009-02-11 15:16:00 -08:00
Brian Paul
6b06a6b929 gallium: const-correctness for u_linear.c functions 2009-02-11 14:11:48 -07:00
Brian Paul
81374d1ebe gallium: silence warnings about void ptr arithmetic 2009-02-11 14:09:22 -07:00
Brian Paul
da4f933eb2 mesa: refactor MATH_SOURCES, remove Mesa x86 codegen from gallium build
Omit math/m_xform.c from gallium builds since it's not used and it's the
one place we were pulling in the Mesa x86 codegen which collides with
gallium's x86 codegen.

Can now omit ASM_C_SOURCES from gallium build too.
2009-02-11 14:01:29 -07:00
Brian Paul
2218592d47 mesa: get rid of _math_init()
Only VBO uses the evaluator code so call _math_init_eval() there.

Only TNL uses the transform/translate code so call _math_init_transformation()
and _math_init_translate9) there.

This is a step toward resolving some symbol collisions between Mesa's and
gallium's x86 codegen.
Have VBO and TNL modules call _math_init_transformation()
2009-02-11 13:52:17 -07:00
Dan Nicholson
c5bae14245 autoconf: Adjust to new asm SOURCES variables
Commit 90b2beb661 changed the assembly
variables. Without this change, the glapi assembly wasn't being built
when it was supposed to, resulting in missing symbols in libGL.

Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
2009-02-11 11:58:39 -08:00
Dan Nicholson
61e925f354 autoconf: Restore commented ASM_FLAGS
This is not the proper approach to disabling assembly. If there are bugs,
they should be fixed or the assembly can default to off.

Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
2009-02-11 11:56:17 -08:00
Dan Nicholson
277bf235f1 Add external pixman CFLAGS after all internal include paths
With the pixman CFLAGS at the beginning of the command line, my build
was picking up the glcore.h from glproto, which doesn't have any of the
TFP fields in __GLcontextmodes.

Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
2009-02-11 11:55:59 -08:00
Younes Manton
36b83f5198 nouveau: 1xN, Nx1 levels of a swizzled mip tree shouldn't be aligned. 2009-02-11 11:58:35 -05:00
José Fonseca
874f364e9e draw: Cap max vertices instead of failing assert. 2009-02-11 16:48:34 +00:00
Brian Paul
b6ad7c8c4a demos: minor updates for shader_api.c test
Mesa's glGetUniformLocation() does support array indexes.

Minor code reformatting.

It would be great if this program were converted into a glean test...
2009-02-11 09:17:22 -07:00
Brian Paul
2b4f0216bf glsl: allow setting arrays of samplers in set_program_uniform()
Arrays of sampler vars haven't been tested much and might actually be broken.
Will need to be revisited someday.

Another fix for bug 20056.
2009-02-11 09:17:22 -07:00
Brian Paul
234f03e90a glsl: raise GL_INVALID_OPERATION for glUniform(location < -1)
location = -1 is silently ignored, but other negative values should raise
an error.

Another fix for bug 20056.
2009-02-11 09:17:21 -07:00
Brian Paul
4ef7a93296 glsl: rework _mesa_get_uniform[fi]v() to avoid using a fixed size intermediate array 2009-02-11 09:17:21 -07:00
Brian Paul
2c1ea0720d glsl: fix glUniform() array bounds error checking
If too many array elements are specified, they're to be silently ignored (don't
raise a GL error).

Fixes another issue in bug 20056.
2009-02-11 09:17:21 -07:00
Brian Paul
369d1859d7 glsl: fix incorrect size returned by glGetActiveUniform() for array elements.
Fixes one of the issues in bug 20056.
2009-02-11 09:17:21 -07:00
Johannes Engel
1e81855566 Add install target for egl
Signed-off-by: Johannes Engel <jcnengel@googlemail.com>
Acked-by: Jakob Bornecrantz <jakob@vmware.com>
2009-02-11 07:01:40 +01:00
Brian Paul
5f75013822 demos: better error message for overlay.c, see bug 20055 2009-02-11 07:53:56 -07:00
José Fonseca
98a053cfd4 mesa: Use the stdio wrappers.
snprint symbol does not exist in Windows.
2009-02-11 13:52:11 +00:00
José Fonseca
7892bdfc8a wgl: Add a few more stubs.
I wonder why we need this... It is only necessary for the MSVC build.
MinGW does not require them.
2009-02-11 13:51:34 +00:00
José Fonseca
8cadf6c0a1 mesa: Move statements after declarations. 2009-02-11 13:50:43 +00:00
Eric Anholt
5d5ae371ea intel: Add x8r8g8b8 visuals to DRI1 fbconfigs alongside a8r8gb8.
This involved fixing driConcatConfigs to not return const (which had made a
mess of a previous patch too).
2009-02-10 18:45:18 -08:00
Eric Anholt
a49ff9f95e sis: fix signedness warnings 2009-02-10 18:45:18 -08:00
Eric Anholt
e7ee7a549d trident: Fix signedness warning. 2009-02-10 18:45:18 -08:00
Eric Anholt
0cb295584f tdfx: Fix begin/endquery for current API. 2009-02-10 18:45:18 -08:00
Eric Anholt
01bc4d441f intel: Don't do the extra MI_FLUSH in flushing except when doing glFlush().
Everything other than "make sure the last rendering ends up visible on the
screen" doesn't need that behavior.
2009-02-10 18:45:18 -08:00
Eric Anholt
0b63f6449e intel: Speed up glDrawPixels(GL_ALPHA) by using an alpha texture format. 2009-02-10 18:45:18 -08:00
Eric Anholt
d11981e0d7 intel: Fix some state leakage of {Client,}ActiveTexture in metaops.
Found while debugging cairo-gl.
2009-02-10 18:45:17 -08:00
Eric Anholt
f82f1ffba9 intel: don't crash when dri2 tells us about buffers we don't care about. 2009-02-10 18:45:17 -08:00
Eric Anholt
f967e8b507 dri2: Don't crash if the server returns more buffers than expected. 2009-02-10 18:45:17 -08:00
Eric Anholt
680c708dee dri2: Initialize variables for the getbuffers round-trip reduction.
Missed setting the initial values which usually didn't hurt at runtime.
2009-02-10 18:45:17 -08:00
Brian Paul
36c1e756da docs: some Cell driver docs updates 2009-02-10 19:36:52 -07:00
Brian Paul
0996a23e3d cell: asst build fixes in linux-cell config
Add -D_SVID_SOURCE to silence warnings when building glx files.
Don't build the non-gallium drivers.
2009-02-10 19:34:08 -07:00
Jakob Bornecrantz
7e54d7d3d6 gallium: Update autoconf to latest gallium build 2009-02-11 02:45:15 +01:00
Jakob Bornecrantz
e94b4dd4f0 gallium: Disable nouveau by default
Most piep drivers should be able to build by default, but since
	the nouveau ones depend drm they can't be enabled by default.
2009-02-11 02:43:27 +01:00
Brian Paul
9c101c44c4 cell: update Cell driver info (code is on master now) 2009-02-10 16:56:58 -07:00
Brian Paul
5340b6dff7 Merge commit 'origin/gallium-master-merge'
This is the big merge of the gallium-0.2 branch into master.
gallium-master-merge was just the staging area for it.
Both gallium-0.2 and gallium-master-merge are considered closed now.

Conflicts:

	progs/demos/Makefile
	src/mesa/main/state.c
	src/mesa/main/texenvprogram.c
2009-02-10 16:44:02 -07:00
Brian Paul
ee4c921b65 Merge commit 'origin/gallium-0.2' into gallium-master-merge 2009-02-10 16:34:51 -07:00
Brian Paul
9fd26daec2 mesa: remove the unused _mesa_UpdateTexEnvProgram() function 2009-02-10 16:30:24 -07:00
Brian Paul
537d3ed6f3 mesa: another fix for program/texture state validation
This fixes a regression introduced in 46ae1abbac

Break program validation into two steps, do part before texture state
validation and do the rest after:
1. Determine Vertex/Fragment _Enabled state.
2. Update texture state.
3. Determine pointers to current Vertex/Fragment programs (which may involve
generating new "fixed-function" programs).

See comments in the code for more details of the dependencies.
2009-02-10 16:28:25 -07:00
Brian Paul
c936a6083e intel: minor reformatting, comments 2009-02-10 15:54:23 -07:00
Brian Paul
1ed5fe5cbf mesa: s/_IMAGE_NEW_TRANSFER_STATE/_MESA_NEW_TRANSFER_STATE/ to be more consistant with other flags 2009-02-10 15:53:35 -07:00
Brian Paul
46ae1abbac mesa: fix/change state validation order for program/texture state
Program state needs to be updated before texture state since the later depends
on the former.

Fixes piglit texgen failure.  The second time through the modes (press 't'
three times) we disable the fragment program and return to conventional texture
mode.  State validation failed here because update_texture() saw stale fragment
program state.
2009-02-10 15:53:35 -07:00
Younes Manton
14d808f8fd nouveau: nv40 swizzled mipmap fixes. 2009-02-10 16:36:33 -05:00
Patrice Mandin
c2be521d24 nouveau: nv30: fix miptree organization to have swizzled texture+mipmap at the right places 2009-02-10 22:22:55 +01:00
Patrice Mandin
24c379badb nouveau: revert all my changes here, not the right way 2009-02-10 22:22:06 +01:00
Patrice Mandin
7b66b24c2e nouveau: stop with 0 dimension 2009-02-10 22:04:56 +01:00
Patrice Mandin
53069cbf29 nouveau: we already have the right src offset 2009-02-10 21:58:49 +01:00
José Fonseca
52233f27bb progs: Build samples dir with scons and glew. 2009-02-10 20:28:08 +00:00