Commit graph

22617 commits

Author SHA1 Message Date
Robert Ellison
73658ff04f i965: fix line stipple fallback for GL_LINE_STRIP primitives
When doing line stipple, the stipple count resets on each line segment,
unless the primitive is a GL_LINE_LOOP or a GL_LINE_STRIP.

The existing code correctly identifies the need for a software fallback
to handle conformant line stipple on GL_LINE_LOOP primitives, but
neglects to make the same assessment on GL_LINE_STRIP primitives.
This fixes it so they match.
2009-02-23 11:28:00 -07:00
José Fonseca
37f21fce3b Merge commit 'origin/gallium-0.1'
Conflicts:
	src/gallium/auxiliary/pipebuffer/pb_bufmgr_mm.c
	src/gallium/auxiliary/util/u_tile.c
2009-02-23 17:21:36 +00:00
Tom Fogal
7399d56ec6 mesa: fix _glxapi_get_proc_address() for mangled names 2009-02-23 08:20:38 -07:00
Joel Bosveld
8344b85333 gallium: Install winsys/drm to DESTDIR rather than / 2009-02-23 08:19:14 -07:00
Tomas Wilhelmsson
41172c0430 mesa: fixes for building on Haiku 2009-02-23 08:11:29 -07:00
Corbin Simpson
d265706cd3 r300-gallium: Fix pasto and debug messages.
This could explain at least one kind of lockup. Yay?
2009-02-23 05:59:59 -08:00
Corbin Simpson
65b79383fb r300-gallium: Cleanup some state emit, move vertex format state to r300_emit.
No need to explicitly update derived state, as it will be done automatically.
2009-02-23 05:59:58 -08:00
José Fonseca
67387bf33f gallium: Define PIPE_PRIM_MAX. 2009-02-23 12:56:45 +00:00
Corbin Simpson
b003b2f6dd r300-gallium: Fix a handful of compile warnings.
Some harmless, some very dangerous.
2009-02-23 04:37:58 -08:00
Corbin Simpson
f72e777911 r300-gallium: Decode passthrough shader for r300.
Looks pretty sane.
2009-02-23 04:37:58 -08:00
Corbin Simpson
763714d900 r300-gallium: Finish VAP/VF setup.
Messy, messy.
2009-02-23 04:37:58 -08:00
Corbin Simpson
d737010296 r300-gallium: Fix BEGIN_CS size. 2009-02-23 04:37:58 -08:00
José Fonseca
c7bbc9ad12 wgl: Enable the use of Win32 threads. 2009-02-23 11:52:59 +00:00
José Fonseca
1456af2f2d mesa: Fix windows build. 2009-02-23 11:24:46 +00:00
Joakim Sindholt
ddc6ee316c r300-gallium: Add pipe_format translators and apply them 2009-02-22 20:03:03 -08:00
Joakim Sindholt
4776ebc648 r300-gallium: Add all supported 2d texture formats 2009-02-22 20:03:02 -08:00
Joakim Sindholt
b11f1c35d5 r300-gallium: correct buffer stride calculation 2009-02-22 20:03:02 -08:00
Brian Paul
27a8432e35 mesa: remove unneeded #include 2009-02-22 16:29:30 -07:00
Brian Paul
1d5a68970f mesa: #include, misc clean-ups 2009-02-22 16:19:29 -07:00
Brian Paul
c74992d840 mesa: remove unneeded #includes 2009-02-22 16:18:38 -07:00
Brian Paul
f2c023291a mesa: move a bunch of compiler-related stuff into new compiler.h header
This trims down and cleans up imports.h and glheader.h quite a bit.
2009-02-22 15:43:29 -07:00
Brian Paul
d909dbcc43 mesa: remove unused ENABLE_TEXGENx, ENABLE_TEXMATx flags 2009-02-22 15:39:54 -07:00
Brian Paul
c7377e2d47 mesa: assorted clean-ups, var renaming, etc. 2009-02-22 15:39:54 -07:00
Brian Paul
901568d068 mesa: simplify texture combine state copying in _mesa_copy_texture_state()
Just copy the whole struct.
2009-02-22 15:39:54 -07:00
Brian Paul
0057f5b8cd mesa: remove redundant assertions (same asserts in context.c) 2009-02-22 15:39:54 -07:00
Brian Paul
022e446c78 gallium: remove dependency on main/glheader.h in glxapi.c
Only needed it for the PUBLIC macro.
2009-02-22 15:37:57 -07:00
Ben Skeggs
e5e255a406 nv50: delay uploads until transfer object is destroyed
It's possible a state tracker will map/unmap a transfer object many times.
Delaying upload until the object is destroyed will prevent unnecessary
uploads to the GPU.

Also fixing a typo here, was unmapping the wrong buffer on transfer_unmap!
2009-02-22 15:47:15 +10:00
Dave Airlie
487a55af78 texmem: fix typo from brianp's changes.
Reported by cjb via tinderbox on irc
2009-02-22 10:37:54 +10:00
Brian Paul
4447fddc82 glapi: update find_entry() for mangled names 2009-02-21 16:07:52 -07:00
Tom Fogal
da46db60a0 mesa: added extern qualifier 2009-02-21 16:07:04 -07:00
Brian Paul
fe0ccf323d mesa: regenerated gl_mange.h file 2009-02-21 16:01:54 -07:00
Brian Paul
d059d03034 mesa: use enums for TEXTURE_x_INDEX values
Plus, put them in the order of highest to lowest priority to simplify
the texture_override() loop.
2009-02-21 15:15:20 -07:00
Brian Paul
9818734e01 mesa: use an array for current texture objects
Use loops to consolidate lots of texture object code.
2009-02-21 14:53:25 -07:00
Brian Paul
4d24b639d1 mesa: use an array for default texture objects
Replace Default1D/2D/3D/Cube/etc with DefaultTex[TEXTURE_x_INDEX].
The same should be done with the Current1D/2D/3D/etc pointers...
2009-02-21 13:59:29 -07:00
Brian Paul
9705cff203 mesa: re-org texgen state
New gl_texgen struct allows quite a bit of code reduction.
2009-02-21 13:23:04 -07:00
Kristian Høgsberg
5b354d39d4 intel: Fix intelSetTexBuffer miptree leak.
The intelImage also holds a reference to the miptree, so unref that as well.
2009-02-21 14:12:53 -05:00
Eric Anholt
40dd024be6 intel: tell libdrm whether we want a cpu-ready or gpu-ready BO for regions.
This lets us avoid allocing new buffers for renderbuffers, finalized miptrees,
and PBO-uploaded textures when there's an unreferenced but still active one
cached, while also avoiding CPU waits for batchbuffers and CPU-uploaded
textures.  The size of BOs allocated for a desktop running current GL
cairogears on i915 is cut in half with this.

Note that this means we require libdrm 2.4.5.
2009-02-21 10:53:41 -08:00
Eric Anholt
078e8a61b2 i965: Fix render target read domains.
We were asking for something illegal (write_domain != 0 && read_domains !=
write_domain) because at the time of writing the region surfaces were used
for texturing occasionally as well, and we weren't really clear on the model
GEM was going to use.

This reliably triggered a kernel bug with domain handling, resulting in
oglconform mustpass.c failure.  Of course, it only became visible after
01bc4d441f cleaned up some gratuitous flushing.
2009-02-21 10:53:05 -08:00
Jakob Bornecrantz
bd2f921d78 trivial: Add tri-viewport 2009-02-21 12:02:19 +01:00
Jakob Bornecrantz
b3bd315e57 trivial: Fix indentation in tri 2009-02-21 12:02:18 +01:00
José Fonseca
0be216c526 pipebuffer: Allow asymmetric guard sizes for under/overflow detection. 2009-02-24 15:49:21 +00:00
José Fonseca
8f3c1cddaa util: Don't use 0-sized arrays.
Not supported by MSVC.
2009-02-24 15:44:09 +00:00
Brian Paul
d6677fd9bc softpipe: minor code movement in softpipe_get_tex_transfer() 2009-02-24 08:33:50 -07:00
Brian Paul
66ddf1a00f cell: added null ptr check in xm_flush_frontbuffer() 2009-02-24 08:32:50 -07:00
Keith Whitwell
e6479c6250 demos: add some fflushes for windows 2009-02-24 12:14:50 +00:00
Keith Whitwell
b1ac00dc8d st/wgl: silence some debug 2009-02-24 12:14:50 +00:00
Keith Whitwell
93d101f0c3 mesa/st: support l8 as well as i8 in bitmap code
Also don't send the partial program fragment down to hardware -- the
program will never be used in that form.
2009-02-24 12:14:50 +00:00
Brian Paul
776971218e gallium: use the TGSI_TEXTURE_SHADOW1D/2D/RECT texture types for TEX instructions
These texture types were defined but never put to use.
For the time being though, the Mesa->TGSI translater isn't emitting these
targets.  See the XXX comment in map_texture_target().
2009-02-20 14:06:25 -07:00
Brian Paul
e0d9073081 i965: use the new prog_instruction::TexShadow field
GLSL shadow() sampler calls are properly propogated down to the driver now.
The glean glsl1 shadow() tests work (except for the alpha channel).
2009-02-20 13:50:27 -07:00
Brian Paul
773e9d4765 i965: check depth_mode in translate_tex_format() for MESA_FORMAT_S8_Z24
Note that I24X8 vs. A24X8 vs. L24X8 doesn't seem to make any difference
for texture/shadow compare, however.
2009-02-20 13:48:44 -07:00