Brian Paul [Wed, 2 Sep 2009 21:39:13 +0000 (15:39 -0600)]
mesa: compute tex env program key size based on nr_enabled_units
When no textures are enabled, the key size is 4 bytes. If unit[0] is
enabled, the key size is 16 bytes.
Inspired by a patch from Chris Wilson.
Brian Paul [Thu, 3 Sep 2009 17:46:28 +0000 (11:46 -0600)]
swrast: wrap comment to 80 columns, remove dead code
Brian Paul [Thu, 3 Sep 2009 17:41:29 +0000 (11:41 -0600)]
mesa: use new combined PBO validate/map helpers in convolution/filter funcs
Brian Paul [Thu, 3 Sep 2009 17:23:05 +0000 (11:23 -0600)]
mesa: use new combined PBO validate/map helpers
Brian Paul [Thu, 3 Sep 2009 17:22:27 +0000 (11:22 -0600)]
mesa: combined PBO validate/map helpers
Brian Paul [Thu, 3 Sep 2009 16:41:14 +0000 (10:41 -0600)]
mesa: use new _mesa_map_pbo_source/dest() functions in more places
This trims down the code a bit. The next step would be to combine
the validate and map operations into one helper...
Brian Paul [Thu, 3 Sep 2009 17:29:18 +0000 (11:29 -0600)]
mesa: consolidate PBO map/unmap helpers
Instead of _mesa_map_readpix_pbo() use _mesa_map_pbo_source().
Instead of _mesa_map_drawpix_pbo() and _mesa_map_bitmap_pbo() use
_mesa_map_pbo_dest().
Brian Paul [Thu, 3 Sep 2009 16:36:49 +0000 (10:36 -0600)]
intel: helper to debug bufmgr (disabled)
Jakob Bornecrantz [Thu, 3 Sep 2009 18:30:54 +0000 (19:30 +0100)]
i915g: Up the number of relocs
Jakob Bornecrantz [Thu, 3 Sep 2009 18:30:36 +0000 (19:30 +0100)]
i915g: Don't run in sync with HW
Jakob Bornecrantz [Thu, 3 Sep 2009 18:28:38 +0000 (19:28 +0100)]
i915g: Don't send flush flags to HW
Zack Rusin [Thu, 3 Sep 2009 16:44:15 +0000 (12:44 -0400)]
st/xorg: cleanup and adjust to the changes in the ureg code
Zack Rusin [Thu, 3 Sep 2009 16:38:10 +0000 (12:38 -0400)]
st/xorg: adjust enums in preperation for gradients
Brian Paul [Thu, 3 Sep 2009 15:41:41 +0000 (09:41 -0600)]
mesa: change ctx->Driver.BufferData() to return GLboolean for success/failure
Return GL_FALSE if we failed to allocate the buffer. Then raise
GL_OUT_OF_MEMORY in core Mesa.
Keith Whitwell [Thu, 3 Sep 2009 14:16:25 +0000 (15:16 +0100)]
aux/tgsi: pull back ureg work from 0.1 branch
Manual merge of ureg changes on the branch. Too much unrelated stuff
for a proper merge.
Christoph Bumiller [Thu, 3 Sep 2009 10:54:41 +0000 (12:54 +0200)]
nv50: move centroid, flat bits when making interp long
Before this, just the perspective divide bit was moved in
convert_to_long of the load interpolant instruction.
Christoph Bumiller [Thu, 3 Sep 2009 10:39:46 +0000 (12:39 +0200)]
nv50: fix vbo_static_attrib method size error
The VTX_ATTR_3/2/1F methods also had size 4 ...
a stupid copy/paste error.
Christoph Bumiller [Thu, 3 Sep 2009 10:37:05 +0000 (12:37 +0200)]
nv50: fix draw_elements_inline_u08/16
We've been emitting the same two indices over and over
without incrementing map.
Cooper Yuan [Thu, 3 Sep 2009 09:06:18 +0000 (17:06 +0800)]
r300g: specify point/line/triangle have stuffed texture coord
Dave Airlie [Thu, 3 Sep 2009 04:14:47 +0000 (14:14 +1000)]
r600: visual depth has no meaning here.
fbos get angry when this happens.
Dave Airlie [Thu, 3 Sep 2009 04:14:31 +0000 (14:14 +1000)]
r600: make sure the active shader bo is re-added to persistent list.
Dave Airlie [Thu, 3 Sep 2009 02:01:52 +0000 (12:01 +1000)]
radeon: pass internal format into the miptree.
We need to figure out if the compression format changes.
without this texcmp segfaults if you change format
enough times.
Dave Airlie [Thu, 3 Sep 2009 02:01:27 +0000 (12:01 +1000)]
radeon/dri2: add gl20 bits for r300/r600 just like dri1 does
Dave Airlie [Thu, 3 Sep 2009 01:33:53 +0000 (11:33 +1000)]
tests/texcmp: glewInit in wrong place
Zack Rusin [Wed, 2 Sep 2009 22:39:21 +0000 (18:39 -0400)]
st/xorg: fix warnings
Zack Rusin [Wed, 2 Sep 2009 22:38:23 +0000 (18:38 -0400)]
st/xorg: handle xrender repeat modes
Zack Rusin [Wed, 2 Sep 2009 21:21:28 +0000 (17:21 -0400)]
st/xorg: flip the coordinate system
Zack Rusin [Wed, 2 Sep 2009 21:16:03 +0000 (17:16 -0400)]
st/xorg: handle solid fills in the fragment shader
Eric Anholt [Wed, 2 Sep 2009 19:17:28 +0000 (12:17 -0700)]
Revert "i965: Use VBOs in the VBO module on 965, now that we have ARB_map_buffer_range."
This reverts commit
00413d87426f14df47d90ba3c995e1889e9f88ca. Even with
fixes, using ARB_map_buffer_range in the VBO module isn't showing up as a
significant win, and some cases apparently regressed.
Bug #23624.
Eric Anholt [Wed, 2 Sep 2009 19:07:37 +0000 (12:07 -0700)]
intel: Add support for FlushMappedBufferRange for ARB_map_buffer_range.
This should help for the usage by the VBO module, where we would upload
the whole remaining chunk of the buffer for a series of range maps that should
cover just a segment of it.
Eric Anholt [Wed, 2 Sep 2009 18:33:08 +0000 (11:33 -0700)]
intel: Sync a synchronized READ_BIT map buffer range with GL drawing to it.
It's probably uncommon, but would obviously have gone wrong.
Eric Anholt [Wed, 2 Sep 2009 05:07:37 +0000 (22:07 -0700)]
intel: Move MapBufferRange mesa state setting up to cover the 915 case.
Jakob Bornecrantz [Wed, 2 Sep 2009 17:48:49 +0000 (19:48 +0200)]
st/xorg: Guard against realy old versions of Xorg
Brian Paul [Wed, 2 Sep 2009 16:38:46 +0000 (10:38 -0600)]
Revert "mesa: fix the non-GNU C bit-field case"
This reverts commit
4b08e7498230eac30eea1721f33994b30999acd4.
Don't know what I was thinking there.
Brian Paul [Wed, 2 Sep 2009 16:12:15 +0000 (10:12 -0600)]
mesa: fix the non-GNU C bit-field case
Gary Wong [Wed, 2 Sep 2009 16:11:15 +0000 (10:11 -0600)]
mesa: silence gcc bit-field warning
Brian Paul [Wed, 2 Sep 2009 15:43:00 +0000 (09:43 -0600)]
mesa: replace 8 with NUM_UNITS
Brian Paul [Wed, 2 Sep 2009 15:25:28 +0000 (09:25 -0600)]
mesa: remove accidentally committed printf
Brian Paul [Wed, 2 Sep 2009 14:45:34 +0000 (08:45 -0600)]
mesa: added #ifdef __GNUC__ around GLubyte bitfield usage
It would be nice if there were a #pragma or something to disable the warnings:
main/texenvprogram.c:87: warning: type of bit-field ‘Source’ is a GCC extension
main/texenvprogram.c:88: warning: type of bit-field ‘Operand’ is a GCC extension
but there doesn't appear to be a way to do that.
Chris Wilson [Wed, 2 Sep 2009 12:11:25 +0000 (05:11 -0700)]
mesa: Compact state key for TexEnv program cache
By rearranging the bitfields within the key we can reduce the size
of the key from 644 to 196 bytes, reducing the cost of both the
hashing and equality tests.
Michel Dänzer [Wed, 2 Sep 2009 14:01:21 +0000 (16:01 +0200)]
st/xorg: Remove code no longer support by xserver Git
Shouldn't be necessary with older versions either.
Michel Dänzer [Wed, 2 Sep 2009 14:00:30 +0000 (16:00 +0200)]
st/xorg: Add support for xserver Git master DRI2 interface.
Reorganize to handle both interfaces with common code.
Michel Dänzer [Wed, 2 Sep 2009 13:41:41 +0000 (15:41 +0200)]
st/dri: Slight consolidation of DRI2 buffer handling.
Always use / assume a combined depth/stencil buffer.
Also update drawable formats from surfaces returned by the driver.
Michel Dänzer [Wed, 2 Sep 2009 13:41:40 +0000 (15:41 +0200)]
st/xorg: Add EXA UploadToScreen and DownloadFromScreen hooks.
Xiang, Haihao [Wed, 2 Sep 2009 05:27:25 +0000 (13:27 +0800)]
i965: CS FENCE in URB_FENCE is 11-bits wide
Xiang, Haihao [Thu, 20 Aug 2009 10:19:36 +0000 (18:19 +0800)]
i965: validate sf state
Eric Anholt [Mon, 31 Aug 2009 17:13:22 +0000 (10:13 -0700)]
mesa: Make MultiDrawElements submit multiple primitives at once.
Previously, MultiDrawElements just called DrawElements a bunch of times.
By sending several primitives down the pipeline at once, we avoid a bunch
of validation. On my GL demo, this improves fps by 2.5% (+/- .41%) and
reduces CPU usage by 70.5% (+/- 2.9%) (n=3).
Reviewed by: Ian Romanick <ian.d.romanick@intel.com>
Ben Skeggs [Wed, 2 Sep 2009 02:03:42 +0000 (12:03 +1000)]
nv50: SWZ is the same as MOV from our perspective
Brian Paul [Tue, 1 Sep 2009 23:40:07 +0000 (17:40 -0600)]
mesa: skip bitmap drawing code if width==0 or height==0
Brian Paul [Tue, 1 Sep 2009 23:12:47 +0000 (17:12 -0600)]
intel: use _mesa_expand_bitmap() to skip an intermediate buffer
Brian Paul [Tue, 1 Sep 2009 23:11:59 +0000 (17:11 -0600)]
st/mesa: use new _mesa_expand_bitmap() function
Brian Paul [Tue, 1 Sep 2009 23:11:35 +0000 (17:11 -0600)]
mesa: new _mesa_expand_bitmap() function
Brian Paul [Tue, 1 Sep 2009 22:26:03 +0000 (16:26 -0600)]
mesa: remove redundant assignments
Brian Paul [Tue, 1 Sep 2009 22:22:02 +0000 (16:22 -0600)]
mesa: more clean-ups
Brian Paul [Tue, 1 Sep 2009 22:10:57 +0000 (16:10 -0600)]
mesa: change conditional to match the previous one
Brian Paul [Tue, 1 Sep 2009 22:05:07 +0000 (16:05 -0600)]
mesa: updated #includes
Brian Paul [Tue, 1 Sep 2009 22:03:28 +0000 (16:03 -0600)]
mesa: remove unused texenv_fragment_program::ctx field
Brian Paul [Tue, 1 Sep 2009 22:01:12 +0000 (16:01 -0600)]
mesa: remove unused ureg::abs field
Brian Paul [Tue, 1 Sep 2009 21:58:49 +0000 (15:58 -0600)]
mesa: remove unused ureg:negateabs field
Brian Paul [Tue, 1 Sep 2009 21:57:36 +0000 (15:57 -0600)]
mesa: more comments, clean-ups
Brian Paul [Tue, 1 Sep 2009 21:51:23 +0000 (15:51 -0600)]
mesa: simplify translate_tex_src_bit()
Brian Paul [Tue, 1 Sep 2009 21:49:55 +0000 (15:49 -0600)]
mesa: minor code clean-ups, comments
Brian Paul [Tue, 1 Sep 2009 21:34:16 +0000 (15:34 -0600)]
mesa: replace 8 with MAX_TEXTURE_UNITS
Brian Paul [Tue, 1 Sep 2009 18:43:23 +0000 (12:43 -0600)]
dri: remove unused meta_clear_tris()
Brian Paul [Tue, 1 Sep 2009 18:41:32 +0000 (12:41 -0600)]
intel: use BUFFER_BITS_COLOR
Brian Paul [Tue, 1 Sep 2009 18:39:30 +0000 (12:39 -0600)]
intel: fix incorrect parameter type for intel_bufferobj_map_range()
Brian Paul [Tue, 1 Sep 2009 18:32:01 +0000 (12:32 -0600)]
radeon: trim down #includes
Brian Paul [Tue, 1 Sep 2009 18:28:48 +0000 (12:28 -0600)]
radeon: use _mesa_meta_clear()
Brian Paul [Tue, 1 Sep 2009 18:24:30 +0000 (12:24 -0600)]
mesa: obey stencil write mask in _mesa_meta_draw_pixels()
Brian Paul [Tue, 1 Sep 2009 18:23:52 +0000 (12:23 -0600)]
intel: set Length/Offset fields in intel_bufferobj_map()
Brian Paul [Tue, 1 Sep 2009 18:23:01 +0000 (12:23 -0600)]
intel: use _mesa_meta_copy_pixels() when do_blit_copypixels() fails
Also, trim down #includes.
Brian Paul [Tue, 1 Sep 2009 18:18:55 +0000 (12:18 -0600)]
intel: trim down #includes
Brian Paul [Tue, 1 Sep 2009 18:16:13 +0000 (12:16 -0600)]
intel: use _mesa_meta_draw_pixels()
The textured quad path is slightly faster and will work with POT textures
on i945.
Brian Paul [Tue, 1 Sep 2009 18:07:52 +0000 (12:07 -0600)]
intel: trim down #includes
Brian Paul [Tue, 1 Sep 2009 18:05:41 +0000 (12:05 -0600)]
intel: use _mesa_meta_clear(), it's a bit faster
Pauli Nieminen [Tue, 1 Sep 2009 23:03:13 +0000 (02:03 +0300)]
radeon: Fix OQ to set ful lstate as dirty too.
Pauli Nieminen [Tue, 1 Sep 2009 22:28:46 +0000 (01:28 +0300)]
radeon: Fix debug output to filter out less critical messages instead of more critical.
Zack Rusin [Tue, 1 Sep 2009 23:01:05 +0000 (19:01 -0400)]
st/xorg: getting indexes right tends to be helpful
Zack Rusin [Tue, 1 Sep 2009 22:59:01 +0000 (18:59 -0400)]
st/xorg: redo the vertex shader
Zack Rusin [Tue, 1 Sep 2009 21:49:32 +0000 (17:49 -0400)]
st/xorg: setup solid fills
Zack Rusin [Tue, 1 Sep 2009 18:43:59 +0000 (14:43 -0400)]
st/xorg: fold back the helper function into core
Zack Rusin [Tue, 1 Sep 2009 18:43:04 +0000 (14:43 -0400)]
st/xorg: start rendering and compositing pictures
Ian Romanick [Tue, 1 Sep 2009 18:10:05 +0000 (11:10 -0700)]
ARB prog parser: Fix handling of stateOptModMatNum
The optional array index should clearly be enclosed in square
brackets. This helps the oglconform test vp_binding.c get a bit
farther, but it still fails.
Keith Whitwell [Tue, 1 Sep 2009 16:29:24 +0000 (17:29 +0100)]
tgsi: remove redundant CND0 opcode
Can be implemented with CMP src2, src1, src0
José Fonseca [Tue, 1 Sep 2009 11:22:52 +0000 (12:22 +0100)]
scons: Tool for LLVM. Gracefully disable llvmpipe if LLVM not found.
Jakob Bornecrantz [Tue, 1 Sep 2009 09:56:14 +0000 (11:56 +0200)]
trace: Don't set surface_[fill|copy] if not set on pipe
Cooper Yuan [Tue, 1 Sep 2009 09:59:03 +0000 (17:59 +0800)]
r300g: Fix clear issue on r300
Dave Airlie [Tue, 1 Sep 2009 06:04:39 +0000 (16:04 +1000)]
radeon: fix r100/r200 polygon stipple under kms
There really need to use state emits under kms, otherwise
we end up with some dwords in the command buffer before we've
ever emitted any useful state.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Dave Airlie [Tue, 1 Sep 2009 05:18:17 +0000 (15:18 +1000)]
r100: fixup cubemap domains
Brian Paul [Tue, 1 Sep 2009 03:14:50 +0000 (21:14 -0600)]
xlib: plug in more meta functions, if TEST_META_FUNCS is set
Brian Paul [Tue, 1 Sep 2009 03:13:41 +0000 (21:13 -0600)]
mesa: implement GL_DEPTH_BUFFER_BIT for _mesa_meta_blit_framebuffer()
Brian Paul [Tue, 1 Sep 2009 02:25:10 +0000 (20:25 -0600)]
mesa: disable another debug test
Brian Paul [Tue, 1 Sep 2009 01:49:40 +0000 (19:49 -0600)]
mesa: make verts[] arrays local vars
Dave Airlie [Tue, 1 Sep 2009 02:15:32 +0000 (12:15 +1000)]
r200: emit cube for kms correctly + fix tex emit reset
CS checker found some issues.
Brian Paul [Tue, 1 Sep 2009 01:29:24 +0000 (19:29 -0600)]
xlib: option to enable/test meta functions (disabled)
Brian Paul [Tue, 1 Sep 2009 01:28:11 +0000 (19:28 -0600)]
mesa: implement depth/stencil formats for meta glDrawPixels
Brian Paul [Tue, 1 Sep 2009 01:27:42 +0000 (19:27 -0600)]
mesa: remove accidentally commited debug/disabled code
Brian Paul [Tue, 1 Sep 2009 01:26:00 +0000 (19:26 -0600)]
mesa: added _mesa_is_stencil_format()
Brian Paul [Mon, 31 Aug 2009 23:56:41 +0000 (17:56 -0600)]
progs/samples: added test/debug code for culling
Brian Paul [Mon, 31 Aug 2009 23:54:46 +0000 (17:54 -0600)]
swrast: fix selection/feedback regression
This fixes a conform selection/feedback regression introduced by commit
8f4d66c5f893b49eb3973aa3b31a856314c045c7