Commit graph

22853 commits

Author SHA1 Message Date
Stephane Marchesin
59edbc70cd Merge branch 'gallium-0.2' of git+ssh://marcheu@git.freedesktop.org/git/mesa/mesa into gallium-0.2 2009-02-02 02:13:07 +01:00
Stephane Marchesin
4035e0f898 nv04: some old changes I had lying around. 2009-02-02 02:12:46 +01:00
Zack Rusin
1c90cdd878 Merge branch 'gallium-winsys-private' into gallium-0.2 2009-02-01 18:48:16 -05:00
Ian Romanick
5b5ddfb89c glxgears: No, really. Fix the dyslexia. 2009-02-01 11:56:07 -08:00
José Fonseca
9aa73cfae8 progs: Get more samples building on windows. 2009-02-01 12:00:17 +00:00
José Fonseca
64e525eab9 util: List new file in sconscript. 2009-02-01 10:31:25 +00:00
José Fonseca
4ad190c96f pipebuffer: Drop (most of) pipe winsys stuff. 2009-02-01 10:28:16 +00:00
Pekka Paalanen
7062b7c7cb nv20: send buffer handles on hw state emit
Color and Z buffer offsets were emitted here, now also the buffer
handles are emitted so they target the correct memory.

Signed-off-by: Pekka Paalanen <pq@iki.fi>
2009-01-31 23:41:23 +02:00
Pekka Paalanen
767f72c108 nv20: disable depth writes in hw init
Probably not necessary, but just in case. Depth registers point to the
color buffer, when there is no depth buffer.

Signed-off-by: Pekka Paalanen <pq@iki.fi>
2009-01-31 23:41:23 +02:00
Pekka Paalanen
9116f9408e nv20: Z-mapping parameters
Based on my renouveau dump, adjust initial hw state related to Z-mapping,
and add one unknown depth reg into depth/stencil/alpha emission.

Now trivial/tri-z on nv20 looks identical to swrast rendered one.

Signed-off-by: Pekka Paalanen <pq@iki.fi>
2009-01-31 23:41:23 +02:00
Pekka Paalanen
b5e2ab63e8 nv20: draw_elements needs to flush
nv20_draw_elements() uses the draw module, and draw_flush() needs to be
called to actually emit the vertices immediately.

Signed-off-by: Pekka Paalanen <pq@iki.fi>
2009-01-31 23:41:22 +02:00
Pekka Paalanen
5e96feed37 nv20: set surface status in clear()
Other nvXX drivers seem to do this, so I do it too.

Signed-off-by: Pekka Paalanen <pq@iki.fi>
2009-01-31 23:41:22 +02:00
Zack Rusin
969c728095 gallium: initialize simple screen in drivers 2009-01-31 15:14:38 -05:00
Eric Anholt
24ff169486 intel: Correct FBconfig color masks with DRI2. Fail at copy and paste.
This still leaves us with a broken depth 32 visual, but now it's the server's
visual setup that's at fault.
2009-01-31 12:04:07 -08:00
Eric Anholt
1265e7267e Build dri.pc during the build rather than the install process.
In a normal build system this is generated by configure.
2009-01-31 12:04:07 -08:00
Brian
0001deef11 mesa: more display list cleanups
Remove some unneeded fields.  Rename some function parameters.
2009-01-31 12:11:40 -07:00
Brian
446abc2799 mesa: display list clean-ups
Rename some structs and fields to be more consistant with the rest of mesa.
2009-01-31 12:11:28 -07:00
Brian
7721bf267b mesa: minor comments, clean-ups 2009-01-31 12:11:28 -07:00
Brian
c6423132ff mesa: remove remnant of GL_SGIX_depth_texture 2009-01-31 12:11:28 -07:00
Keith Packard
954dfba129 i965: bump texture limit to 4kx4k
Rendering and textures are limited to 8kx8k, but mesa limits things to
4kx4k, and magic guard band stuff may break on 8kx8k drawing. This is safe
though, and makes compiz work on bigger screens.

Signed-off-by: Keith Packard <keithp@keithp.com>
2009-01-30 21:51:32 -08:00
Brian Paul
80684649a6 mesa: simplify the _mesa_get_proxy_tex_image() function 2009-01-30 16:03:32 -07:00
Brian Paul
ea4b183b8c mesa: fix incorrect call to clear_teximage_fields() in _mesa_TexImage2D()
Fixes failed assertion / segfault for particular proxy texture tests.
2009-01-30 16:03:32 -07:00
Brian Paul
7f0b6a7796 intel: more debug info 2009-01-30 16:03:32 -07:00
Brian Paul
5a225dd812 i965: formatting, comments, whitespace clean-ups 2009-01-30 16:03:32 -07:00
Brian Paul
2d5b86be25 swrast: replace RENDER_START/FINISH macros with inline functions 2009-01-30 16:03:32 -07:00
Brian Paul
81ca8b93f2 swrast: replace macro with inline function 2009-01-30 16:03:32 -07:00
Brian Paul
bd944ef783 intel: remove unused RenderToTexture field 2009-01-30 16:03:32 -07:00
Brian Paul
4b37b1129e i915: updated render to texture/fbo test 2009-01-30 16:03:32 -07:00
Zack Rusin
26c9b15343 gallium: add a convience wrapper for simple screens
forwards screen calls to the winsys
2009-01-30 17:59:55 -05:00
Ian Romanick
9d6880ec8d Fix dyslexia. 2009-01-30 14:55:42 -08:00
Ian Romanick
58b9cd411f glxgears: Log a message if synched to vblank
Tries to use either GLX_MESA_swap_control or GLX_SGI_video_sync to
detect whether the display is synchronized to the vertical blank.  If
it detects this, a message will be printed.  HOPEFULLY this will
prevent some of the bug reports such as "glxgears only gets 59.7fps.
What's wrong with my driver?"
2009-01-30 14:45:01 -08:00
Brian Paul
7c48719a5f mesa: add missing _mesa_reference_texobj() calls for texture array targets 2009-01-30 15:35:43 -07:00
Brian Paul
88e0b92a74 mesa: remove incorrect refcounting adjustment in adjust_buffer_object_ref_counts()
Fixes bug 19835.  However, a more elaborate fix should be implemented someday
which uses proper reference counting for gl_array_object.
2009-01-30 15:35:43 -07:00
José Fonseca
8d0b689a56 stw: Remove pipe_winsys references. 2009-01-30 22:04:35 +00:00
José Fonseca
ecc0e1ec2e gallium: Don't ask winsys name -- let pipe screen do that if it wants.
Allows to leave screen->winsys NULL.
2009-01-30 22:04:15 +00:00
José Fonseca
b5d96a3e7f stw: Don't use the winsys. 2009-01-30 21:51:59 +00:00
Eric Anholt
67ee22c89f intel: If we're doing a depth clear with tris, do color with it.
This is a 10% win on the ever-important glxgears not-a-benchmark.
2009-01-30 13:46:37 -08:00
Eric Anholt
ac0dfbdf0f i915: Only call CalcViewport from DrawBuffers instead of Viewport.
This saves an inadvertent round-trip to the X Server on DrawBuffers, which was
hurting some metaops.
2009-01-30 13:46:37 -08:00
Eric Anholt
3ee21f30cd intel: Expose more FBconfigs in the 3D driver.
We can support any combination of (a8r8g8b8, x8r8g8b8, r5g6b5) x (z0,z24,z24s8)
on either class of chipsets.  The only restriction is no mixing bpp when also
mixing tiling.  This shouldn't be occurring currently.
2009-01-30 13:46:37 -08:00
Ian Romanick
bc968e515d Remove stale symlinks to intel/intel_depthstencil.c 2009-01-30 13:26:37 -08:00
Zack Rusin
adfbba476d gallium: make p_winsys internal
move it to pipe/internal/p_winsys_screen.h and start converting
the state trackers to the screen usage
2009-01-30 15:57:33 -05:00
Dan Nicholson
a3d223f0d2 autoconf: Use include-fixed directory with makedepend on newer GCC
On newer GCC releases, the compiler's headers have been split between
the include and include-fixed directories. Add both if the directories
exist.

Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Julien Cristau <jcristau@debian.org>
2009-01-30 12:03:16 -08:00
José Fonseca
3cfaccf92a Merge branch 'gallium-0.2' into gallium-winsys-private 2009-01-30 17:01:23 +00:00
José Fonseca
462f09487e util: Define ffs for MinGW. 2009-01-30 14:59:32 +00:00
José Fonseca
0c75e59bfd gdi: Update for winsys interface changes. 2009-01-30 14:32:11 +00:00
José Fonseca
46edad7d29 Merge branch 'gallium-0.2' into gallium-winsys-private 2009-01-30 14:07:12 +00:00
José Fonseca
7996b3e034 pipebuffer: Consider 0 as no alignment needed. 2009-01-30 14:06:25 +00:00
Zack Rusin
b3028acd98 gallium: give the screen priority when it comes to buffer allocations
allows the driver to overwrite buffer allocation, first step on the way
to making winsys interface internal to the drivers. state trackers and
the code above it will go through the screen
2009-01-29 21:43:15 -05:00
Jakob Bornecrantz
1f9fff28a4 gallium: Don't build egl state_tracker 2009-01-30 02:24:47 +01:00
Jakob Bornecrantz
0ac83a0ebb egl: Don't fill shown screen 2009-01-30 01:57:07 +01:00