OSDN Git Service
Corbin Simpson [Fri, 13 Feb 2009 00:53:06 +0000 (16:53 -0800)]
r300-gallium: Add r500 passthrough shader assembly.
This allows a simple passthrough fragment shader to be provided on r500.
Corbin Simpson [Fri, 13 Feb 2009 00:52:15 +0000 (16:52 -0800)]
r300-gallium: Fix typo in texture buffer size request.
Jakob Bornecrantz [Fri, 13 Feb 2009 00:17:11 +0000 (01:17 +0100)]
intel: Only build winsys with built state trackers
Jakob Bornecrantz [Thu, 12 Feb 2009 23:57:47 +0000 (00:57 +0100)]
gallium: Add a bunch of autoconf options
./configure --help for more info
Benjamin Close [Thu, 12 Feb 2009 23:37:26 +0000 (10:07 +1030)]
galium: Makefile fixes: -Werror=implicit-function-declaration -> -Werror-implicit-function-declaration
Found-By: Tinderbox
Jakob Bornecrantz [Mon, 2 Feb 2009 00:30:05 +0000 (01:30 +0100)]
intel: Make gem export the drm_api_hocks
Jakob Bornecrantz [Mon, 2 Feb 2009 00:33:38 +0000 (01:33 +0100)]
intel: Remove the old depricated dri1 winsys
Jakob Bornecrantz [Mon, 2 Feb 2009 00:32:11 +0000 (01:32 +0100)]
intel: Remove the ttm backend
RIP ttm, its been fun knowing you.
Robert Ellison [Thu, 12 Feb 2009 20:47:36 +0000 (13:47 -0700)]
glDrawBuffers(n==0) is valid
According to the GL spec, calling glDrawBuffers() with n == 0 is a
valid operation (and essentially prevents drawing to any buffers).
But _msa_DrawBuffersARB() was producing a GL_INVALID_VALUE error in
this case.
This fix adjusts the error check, and makes a small change to the
ctx->Driver.DrawBuffer() call below to ensure that, if n == 0,
Driver.DrawBuffer() is called with GL_NONE and that buffers[0] is
*not* referenced in this case (since we don't know whether it is valid).
Internal identifier: 365833
Brian Paul [Thu, 12 Feb 2009 17:14:36 +0000 (10:14 -0700)]
mesa: use new ST_CALLOC_STRUCT() macro in gallium state tracker
Brian Paul [Thu, 12 Feb 2009 17:08:25 +0000 (10:08 -0700)]
mesa: consistantly use mesa memory-functions in gallium state tracker
Use _mesa_malloc(), _mesa_free(), etc everywhere, not malloc(), free(), etc.
Still using CALLOC_STRUCT() at this point.
Brian Paul [Thu, 12 Feb 2009 16:21:50 +0000 (09:21 -0700)]
mesa: don't include m_xform.h where not needed
Brian Paul [Thu, 12 Feb 2009 16:17:18 +0000 (09:17 -0700)]
mesa: move _mesa_transform_vector() from m_xform.c to m_matrix.c
m_xform.c is omitted from gallium builds but _mesa_transform_vector() is
still needed.
Brian Paul [Thu, 12 Feb 2009 16:15:38 +0000 (09:15 -0700)]
mesa: remove unused functions in m_xform.[ch]
The functions are:
_mesa_project_points()
_mesa_transform_bounds3()
_mesa_transform_bounds2()
_mesa_transform_point_sz()
Brian Paul [Thu, 12 Feb 2009 15:58:12 +0000 (08:58 -0700)]
mesa: restore FLUSH_VERTICES() in _mesa_notifySwapBuffers()
Brian Paul [Thu, 12 Feb 2009 15:30:58 +0000 (08:30 -0700)]
mesa: remove empty, unneeded mathmod.h header
José Fonseca [Thu, 12 Feb 2009 15:49:55 +0000 (15:49 +0000)]
glut: Fix broken font symbols when gcc visibility attributes used.
Jakob Bornecrantz [Wed, 11 Feb 2009 15:53:53 +0000 (16:53 +0100)]
egl: Use only libdrm structs for kms
José Fonseca [Thu, 12 Feb 2009 13:54:20 +0000 (13:54 +0000)]
progs: Prevent clash with min macro.
José Fonseca [Thu, 12 Feb 2009 13:52:16 +0000 (13:52 +0000)]
glut: Don't try to guess system headers.
Just include them, especially such basic header as stdlib.h
Keith Whitwell [Thu, 12 Feb 2009 13:30:01 +0000 (13:30 +0000)]
tgsi: keep immediate file info uptodate
Make sure the stats for TGSI_FILE_IMMEDIATE are uptodate. Previously
we just had immediate_count, but file_*[TGSI_FILE_IMMEDIATE] were
bogus.
José Fonseca [Thu, 12 Feb 2009 12:59:58 +0000 (12:59 +0000)]
scons: Unbreak mingw builds.
José Fonseca [Thu, 12 Feb 2009 11:58:04 +0000 (11:58 +0000)]
scons: Build xlib state tracker regardless of DRI settings.
José Fonseca [Thu, 12 Feb 2009 11:57:45 +0000 (11:57 +0000)]
scons: Build DLLs/EXEs with more memory debugger friendlier settings.
Brian Paul [Thu, 12 Feb 2009 05:13:17 +0000 (22:13 -0700)]
softpipe: asst clean-ups, const correctness, comments
Brian Paul [Thu, 12 Feb 2009 05:03:34 +0000 (22:03 -0700)]
softpipe: remove unneeded #include
Brian Paul [Thu, 12 Feb 2009 05:01:43 +0000 (22:01 -0700)]
softpipe: asst comments, clean-ups
Brian Paul [Thu, 12 Feb 2009 04:51:00 +0000 (21:51 -0700)]
softpipe: remove some old polygon stipple stuff and do some clean-ups
Brian [Thu, 12 Feb 2009 04:44:38 +0000 (21:44 -0700)]
softpipe: updated comments
Brian [Thu, 12 Feb 2009 04:38:20 +0000 (21:38 -0700)]
softpipe: rename PRIM_x to QUAD_PRIM_x
Brian [Thu, 12 Feb 2009 04:33:59 +0000 (21:33 -0700)]
softpipe: rename sp_headers.h to sp_quad.h
This header describes the quad-related datatypes afterall.
Brian [Thu, 12 Feb 2009 04:30:21 +0000 (21:30 -0700)]
softpipe: rename single-include preprocessor symbol, add comments
Brian [Thu, 12 Feb 2009 04:25:10 +0000 (21:25 -0700)]
softpipe: rename sp_quad.[ch] -> sp_quad_pipe.[ch]
Be more consistant with 'draw' module.
Robert Ellison [Thu, 12 Feb 2009 01:01:34 +0000 (18:01 -0700)]
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.
Dan Nicholson [Wed, 11 Feb 2009 23:16:00 +0000 (15:16 -0800)]
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>
Brian Paul [Wed, 11 Feb 2009 21:11:48 +0000 (14:11 -0700)]
gallium: const-correctness for u_linear.c functions
Brian Paul [Wed, 11 Feb 2009 21:09:22 +0000 (14:09 -0700)]
gallium: silence warnings about void ptr arithmetic
Brian Paul [Wed, 11 Feb 2009 20:59:54 +0000 (13:59 -0700)]
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.
Brian Paul [Wed, 11 Feb 2009 20:52:17 +0000 (13:52 -0700)]
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()
Dan Nicholson [Wed, 11 Feb 2009 19:04:29 +0000 (11:04 -0800)]
autoconf: Adjust to new asm SOURCES variables
Commit
90b2beb661f630966788a6e909dc759c99e38973 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>
Dan Nicholson [Wed, 11 Feb 2009 18:42:34 +0000 (10:42 -0800)]
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>
Dan Nicholson [Wed, 11 Feb 2009 17:55:20 +0000 (09:55 -0800)]
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>
Younes Manton [Wed, 11 Feb 2009 16:52:32 +0000 (11:52 -0500)]
nouveau: 1xN, Nx1 levels of a swizzled mip tree shouldn't be aligned.
José Fonseca [Wed, 11 Feb 2009 16:35:12 +0000 (16:35 +0000)]
draw: Cap max vertices instead of failing assert.
Brian Paul [Wed, 11 Feb 2009 16:14:07 +0000 (09:14 -0700)]
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...
Brian Paul [Wed, 11 Feb 2009 16:12:34 +0000 (09:12 -0700)]
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.
Brian Paul [Wed, 11 Feb 2009 16:05:08 +0000 (09:05 -0700)]
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.
Brian Paul [Wed, 11 Feb 2009 16:03:16 +0000 (09:03 -0700)]
glsl: rework _mesa_get_uniform[fi]v() to avoid using a fixed size intermediate array
Brian Paul [Wed, 11 Feb 2009 15:46:21 +0000 (08:46 -0700)]
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.
Brian Paul [Wed, 11 Feb 2009 15:16:14 +0000 (08:16 -0700)]
glsl: fix incorrect size returned by glGetActiveUniform() for array elements.
Fixes one of the issues in bug 20056.
Johannes Engel [Wed, 11 Feb 2009 10:31:05 +0000 (11:31 +0100)]
Add install target for egl
Signed-off-by: Johannes Engel <jcnengel@googlemail.com>
Acked-by: Jakob Bornecrantz <jakob@vmware.com>
Brian Paul [Wed, 11 Feb 2009 14:53:36 +0000 (07:53 -0700)]
demos: better error message for overlay.c, see bug 20055
José Fonseca [Wed, 11 Feb 2009 13:52:11 +0000 (13:52 +0000)]
mesa: Use the stdio wrappers.
snprint symbol does not exist in Windows.
José Fonseca [Wed, 11 Feb 2009 13:51:34 +0000 (13:51 +0000)]
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.
José Fonseca [Wed, 11 Feb 2009 13:50:43 +0000 (13:50 +0000)]
mesa: Move statements after declarations.
Eric Anholt [Tue, 10 Feb 2009 22:30:38 +0000 (14:30 -0800)]
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).
Eric Anholt [Tue, 10 Feb 2009 22:27:16 +0000 (14:27 -0800)]
sis: fix signedness warnings
Eric Anholt [Tue, 10 Feb 2009 22:24:06 +0000 (14:24 -0800)]
trident: Fix signedness warning.
Eric Anholt [Tue, 10 Feb 2009 22:22:26 +0000 (14:22 -0800)]
tdfx: Fix begin/endquery for current API.
Eric Anholt [Mon, 9 Feb 2009 23:55:15 +0000 (15:55 -0800)]
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.
Eric Anholt [Mon, 9 Feb 2009 13:55:31 +0000 (14:55 +0100)]
intel: Speed up glDrawPixels(GL_ALPHA) by using an alpha texture format.
Eric Anholt [Mon, 9 Feb 2009 14:25:30 +0000 (15:25 +0100)]
intel: Fix some state leakage of {Client,}ActiveTexture in metaops.
Found while debugging cairo-gl.
Eric Anholt [Sun, 8 Feb 2009 14:39:51 +0000 (15:39 +0100)]
intel: don't crash when dri2 tells us about buffers we don't care about.
Eric Anholt [Sun, 8 Feb 2009 14:26:30 +0000 (15:26 +0100)]
dri2: Don't crash if the server returns more buffers than expected.
Eric Anholt [Sun, 8 Feb 2009 14:22:34 +0000 (15:22 +0100)]
dri2: Initialize variables for the getbuffers round-trip reduction.
Missed setting the initial values which usually didn't hurt at runtime.
Brian Paul [Wed, 11 Feb 2009 02:36:52 +0000 (19:36 -0700)]
docs: some Cell driver docs updates
Brian Paul [Wed, 11 Feb 2009 02:33:02 +0000 (19:33 -0700)]
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.
Jakob Bornecrantz [Wed, 11 Feb 2009 01:38:21 +0000 (02:38 +0100)]
gallium: Update autoconf to latest gallium build
Jakob Bornecrantz [Wed, 11 Feb 2009 01:25:10 +0000 (02:25 +0100)]
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.
Brian Paul [Tue, 10 Feb 2009 23:56:58 +0000 (16:56 -0700)]
cell: update Cell driver info (code is on master now)
Brian Paul [Tue, 10 Feb 2009 23:44:02 +0000 (16:44 -0700)]
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
Brian Paul [Tue, 10 Feb 2009 23:34:51 +0000 (16:34 -0700)]
Merge commit 'origin/gallium-0.2' into gallium-master-merge
Brian Paul [Tue, 10 Feb 2009 23:30:24 +0000 (16:30 -0700)]
mesa: remove the unused _mesa_UpdateTexEnvProgram() function
Brian Paul [Tue, 10 Feb 2009 23:28:25 +0000 (16:28 -0700)]
mesa: another fix for program/texture state validation
This fixes a regression introduced in
46ae1abbac6837d051c10b2e8b57eab3d4958ff4
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.
Brian Paul [Tue, 10 Feb 2009 17:12:44 +0000 (10:12 -0700)]
intel: minor reformatting, comments
Brian Paul [Tue, 10 Feb 2009 22:43:05 +0000 (15:43 -0700)]
mesa: s/_IMAGE_NEW_TRANSFER_STATE/_MESA_NEW_TRANSFER_STATE/ to be more consistant with other flags
Brian Paul [Tue, 10 Feb 2009 22:35:25 +0000 (15:35 -0700)]
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.
Younes Manton [Tue, 10 Feb 2009 21:36:33 +0000 (16:36 -0500)]
nouveau: nv40 swizzled mipmap fixes.
Patrice Mandin [Tue, 10 Feb 2009 21:22:55 +0000 (22:22 +0100)]
nouveau: nv30: fix miptree organization to have swizzled texture+mipmap at the right places
Patrice Mandin [Tue, 10 Feb 2009 21:22:06 +0000 (22:22 +0100)]
nouveau: revert all my changes here, not the right way
Patrice Mandin [Tue, 10 Feb 2009 21:04:56 +0000 (22:04 +0100)]
nouveau: stop with 0 dimension
Patrice Mandin [Tue, 10 Feb 2009 20:57:40 +0000 (21:57 +0100)]
nouveau: we already have the right src offset
José Fonseca [Tue, 10 Feb 2009 20:27:49 +0000 (20:27 +0000)]
progs: Build samples dir with scons and glew.
Patrice Mandin [Tue, 10 Feb 2009 20:22:29 +0000 (21:22 +0100)]
nouveau: do not forget to half dimension.
Patrice Mandin [Tue, 10 Feb 2009 20:20:06 +0000 (21:20 +0100)]
nouveau: revert most parts of recent mipmap+swizzle stuff. We only need to find right src and dst offset for given mipmap level.
José Fonseca [Tue, 10 Feb 2009 18:25:31 +0000 (18:25 +0000)]
progs: Build rebook with scons too.
Keith Whitwell [Tue, 10 Feb 2009 18:21:41 +0000 (18:21 +0000)]
wgl: return before locking if stw_icd is NULL
Keith Whitwell [Tue, 10 Feb 2009 19:22:57 +0000 (19:22 +0000)]
Merge commit 'origin/gallium-0.2' into gallium-0.2
Conflicts:
src/gallium/state_trackers/wgl/icd/stw_icd.c
José Fonseca [Tue, 10 Feb 2009 18:11:56 +0000 (18:11 +0000)]
scons: Use parallel builds by default.
Keith Whitwell [Tue, 10 Feb 2009 18:11:44 +0000 (18:11 +0000)]
wgl: mutex-protect the shared stw_icd struct
Patrice Mandin [Tue, 10 Feb 2009 17:44:08 +0000 (18:44 +0100)]
nouveau: dst offset is correct
José Fonseca [Tue, 10 Feb 2009 16:18:22 +0000 (16:18 +0000)]
pipebuffer: Drop reliance on pipe_winsys.
Patrice Mandin [Tue, 10 Feb 2009 17:31:41 +0000 (18:31 +0100)]
Missing: tgsi: Fix build -- rename Size to NrTokens.
Patrice Mandin [Tue, 10 Feb 2009 17:09:10 +0000 (18:09 +0100)]
nouveau: recalc sub width and height for each mipmap level
Jakob Bornecrantz [Tue, 10 Feb 2009 16:43:25 +0000 (17:43 +0100)]
mesa: Build both software rasterizers for debug
But put the gallium one in lib/gallium
Jakob Bornecrantz [Tue, 10 Feb 2009 15:17:32 +0000 (16:17 +0100)]
gallium: Don't rebuild common drm code
Jakob Bornecrantz [Tue, 10 Feb 2009 15:16:15 +0000 (16:16 +0100)]
gallium: Install DRI drivers into lib/gallium
Jakob Bornecrantz [Tue, 10 Feb 2009 15:23:02 +0000 (16:23 +0100)]
gallium: Introduce new subdirs build variables
(based on gallium-xorg-driver/commit
270ce504052d415870a25ab59818b2309eb8ac13)
Jakob Bornecrantz [Tue, 10 Feb 2009 13:14:28 +0000 (14:14 +0100)]
Revert "cell: update linux-cell config"
This reverts commit
22c6c1eaad49692416f45bcbbcdc6424aea2da7c.
Need to revert this since we reverted commited this depended on.
Jakob Bornecrantz [Tue, 10 Feb 2009 12:59:35 +0000 (13:59 +0100)]
Revert "mesa: added new linux-gallium and linux-gallium-debug configs"
This reverts commit
abbe96cb6e7581a52652030e40442b943a482840.
It only reverts parts of the commit the other parts where related to
libmesagallium changes.