Commit graph

24805 commits

Author SHA1 Message Date
Brian Paul
1f71305993 Merge branch 'mesa_7_5_branch'
Conflicts:

	src/mesa/main/state.c
2009-08-05 14:13:48 -06:00
Brian Paul
5b3428d745 docs:fix glBlitFramebuffer() for Gallium 2009-08-05 13:50:21 -06:00
Brian Paul
a59579c983 st/mesa: implement BlitFramebuffer() for depth/stencil (incomplete)
We now handle the case of blitting Z+stencil to/from combined Z/stencil
surfaces.  But Z-only or stencil-only and separate depth/stencil surfaces
are not yet implemented.
2009-08-05 13:46:47 -06:00
Brian Paul
dcebe220f4 mesa: generate GL_INVALID_OPERATION for missing z/stencil when blitting
If glBlitFramebuffer() is called with GL_DEPTH_BUFFER_BIT or
GL_STENCIL_BUFFER_BIT and the src/dst depth/stencil buffers are absent,
report an error.
2009-08-05 13:44:59 -06:00
Brian Paul
f792137593 st/mesa: fix Y inversion and optimize st_BlitFramebuffer()
Need to check for Y inversion separately for src/dest buffers.

If both the src and dest regions are upside down, make them right-side
up for a better chance at a fast path.

progs/tests/copypixrate -blit is much faster now.
2009-08-05 13:26:19 -06:00
Brian Paul
2cd33afa00 util: added comment/question about blit clipping 2009-08-05 13:22:26 -06:00
Brian Paul
727b2d747e mesa: make _mesa_clip_blit() a shared function 2009-08-05 13:21:59 -06:00
Brian Paul
4f36164024 util: added util_blit_pixels() overlap test
A comment alluded to this.  Now it's checked.
2009-08-05 13:19:03 -06:00
Brian Paul
05d393f59f util: fix util_blit_pixels() test for surface_copy() path
For the surface_copy() path require same format, no flipping and no stretching.

Fixes progs/tests/copypixrate -blit
2009-08-05 13:09:15 -06:00
Brian Paul
854ea483d4 util: reformatting and comments 2009-08-05 13:08:19 -06:00
Jakob Bornecrantz
3905119b47 st/xorg: Make it work again 2009-08-05 19:29:31 +01:00
Jakob Bornecrantz
8ccec83e63 st/egl: Create primary texture not display target 2009-08-05 19:29:30 +01:00
Jakob Bornecrantz
0500404cdf i915g: Treat primary textures as scanout buffers 2009-08-05 19:29:30 +01:00
Jakob Bornecrantz
ec269c198a i915g: Link with trace on EGL and Xorg 2009-08-05 19:29:30 +01:00
Jakob Bornecrantz
1f9ee623d1 trace: Use correct texture in drm_api wrapper 2009-08-05 19:29:29 +01:00
Jakob Bornecrantz
6160c8be57 softpipe: Also defere primary textures to backend 2009-08-05 19:29:29 +01:00
Dave Airlie
ac3de85eb6 r200: emit colorpitch 2009-08-05 11:26:29 +10:00
Eric Anholt
63d7a2f53f i965: Fix dangerous warning I let slip in. 2009-08-04 18:07:01 -07:00
Eric Anholt
78c022acd0 i965: Respect CondSwizzle in OPCODE_IF.
Fixes piglit glsl-vs-if-bool and progs/glsl/twoside, and will likely be
useful for the looping code.

Bug #18992
2009-08-04 18:06:34 -07:00
Eric Anholt
7007f8b352 i965: Emit conditional code updates as required for GLSL VS if statements.
Previously, we'd be branching based on whatever condition code happened to be
laying around.
2009-08-04 18:06:34 -07:00
Eric Anholt
011244853b i965: Don't set pop_count in the reserved MBZ area of IF statements. 2009-08-04 18:06:34 -07:00
Eric Anholt
8288ab4518 i965: Print out ELSE and ENDIF src1 arguments like IF does. 2009-08-04 18:06:34 -07:00
Roland Scheidegger
8b9a5cfce0 r200: fix off-by-one errors causing 6th texture unit to not work
both for normal and cube textures, this fixes demos/multiarb
(with 6 enabled texture units) and fixes #23142.
2009-08-05 02:33:34 +02:00
Roland Scheidegger
7c0fb3a1be r200: fix compiler warning (unused var) 2009-08-05 02:33:34 +02:00
Roland Scheidegger
15f5f839b1 radeon: fix miptree comparison breakage
another case of image never matching miptree in case of compressed textures
2009-08-05 01:13:22 +02:00
Roland Scheidegger
80cab49481 intel: implement intelCompressedTexSubImage2D
similar to the radeon code.
passes tests/texcompsub
2009-08-05 01:13:22 +02:00
Roland Scheidegger
0abc9e7565 tests: also test xoffset in texcompsub test
use glCompressedTexSubImage2DARB also with xoffset by splitting into 3 calls
in total. Dunno if the top/bottom reversal is intentional but leave as is.
2009-08-05 01:13:21 +02:00
Eric Anholt
de80eeea0e intel: Add support for EXT_provoking_vertex. 2009-08-04 15:32:18 -07:00
Eric Anholt
b010814e9c i965: Spell "conditional" correctly. 2009-08-04 15:32:18 -07:00
Eric Anholt
1d4bace9fc i965: Hook up the disassembler for INTEL_DEBUG={wm,vs}.
I was getting tired of doing the dance of INTEL_DEBUG=batch, copying it out,
and running intel-gen4disasm on it.
2009-08-04 15:32:18 -07:00
Eric Anholt
ce63e9929c i965: Initial import of disasm code from intel-gen4asm.
There's a bunch of stuff from gen4asm and gpu-tools that we probably want
to make into a library instead of cargo-culting it around.
2009-08-04 15:32:18 -07:00
Eric Anholt
def85826a0 i965: warning fix 2009-08-04 15:32:17 -07:00
Brian Paul
cd7a8225e8 tests/getteximage: test more texture sizes, including npot 2009-08-04 16:17:09 -06:00
Brian Paul
a746ef28df mesa: log the shader checksum 2009-08-04 15:36:29 -06:00
Brian Paul
f7783badb5 mesa: compute, print shader checksum 2009-08-04 15:36:29 -06:00
Brian Paul
b501263bf5 mesa: added gl_shader::SourceChecksum field (for debug purposes) 2009-08-04 15:36:28 -06:00
Brian Paul
9f8110adcc mesa: added _mesa_str_checksum() 2009-08-04 15:36:28 -06:00
Brian Paul
84c8315ae6 mesa: clean-up error debug/count code 2009-08-04 15:36:28 -06:00
Brian Paul
def77160d6 mesa: reset ErrorDebugCount to zero in glGetString() 2009-08-04 15:36:28 -06:00
Brian Paul
b98f0f2d51 mesa: better texture dump/debug code 2009-08-04 15:36:28 -06:00
Brian Paul
2b82bc93e2 mesa: more error message info for vertex pointer functions 2009-08-04 15:36:28 -06:00
Brian Paul
2465c4fa9c mesa: more glGetTexImage() error checking consolidation, new assertion 2009-08-04 15:36:28 -06:00
Eric Anholt
191e028de2 i965: Fix RECT shadow sampling by not losing the other texcoords.
Bug #20821
2009-08-04 12:43:18 -07:00
Brian Paul
3a221a9018 docs: 7.5.1 bug fixes 2009-08-04 09:27:49 -06:00
Brian Paul
61673aebb0 intel: Fix inverted test for disabling flushing of front buffer output.
The comment disagreed with the code, and nicely drew my eyes to what was
going wrong.

Bug #21774 (blender)
Bug #21788 (readpix)

(cherry picked from master, commit fd65418f60)
2009-08-04 09:23:17 -06:00
Brian Paul
f5f8be8bb2 intel: Wait on the last swapbuffers to complete before queuing a new one.
This fixes jerkiness in doom3 and other apps since the kernel change to
throttle less absurdly, which led to a thundering herd of frames.

Because this is a rather minimal fix, there is at least one downside: If
the whole scene completes in one batchbuffer, we'll end up stalling the GPU.

Thanks to Michel Dänzer for suggesting using glFlush to signal frame end
instead of going to all the effort of adding a new DRI2 extension.

(cherry picked from master, commit 0828579a65)
2009-08-04 09:22:15 -06:00
Brian Paul
2bec909c69 texenv: Use VP->Current, since _Current isn't updated at this point.
(cherry picked from master, commit a9ba1bfeb3)
2009-08-04 09:15:33 -06:00
Brian Paul
f0df08abbe texenv: Match state.c in deciding whether we'll be using a vertex shader.
(cherry picked from master, commit 40990d9dfb)
2009-08-04 09:15:09 -06:00
Brian Paul
9d3929b60c texenv: Add missing dependency on VP changes.
Funny thing is I annotated this dependency in
e5f63c403b, but didn't actually use it.

(cherry picked from master, commit 03187571b6)

Conflicts:
	src/mesa/main/state.c
2009-08-04 09:14:33 -06:00
Dan Nicholson
9185a61c8a mklib: Ensure target directory exists for library
Instead of relying on the Makefile to always generate $(TOP)/$(LIB_DIR),
just have mklib handle creating the directory. This should fix any races
when using parallel make.

Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
(cherry picked from commit 23671e5358)
2009-08-04 06:30:46 -07:00