Marek Olšák [Fri, 4 Dec 2009 15:06:16 +0000 (16:06 +0100)]
r300g: fix warnings
Keith Whitwell [Fri, 4 Dec 2009 14:15:21 +0000 (14:15 +0000)]
softpipe: dont claim to support PIPE_FORMAT_NONE
Keith Whitwell [Fri, 4 Dec 2009 11:49:42 +0000 (11:49 +0000)]
softpipe: fix double-minify in texture layout
Roland Scheidegger [Thu, 3 Dec 2009 23:42:53 +0000 (00:42 +0100)]
vega: fix missing include
Roland Scheidegger [Thu, 3 Dec 2009 23:35:14 +0000 (00:35 +0100)]
Merge branch 'gallium-noblocks'
Conflicts:
src/gallium/state_trackers/xorg/xorg_exa.c
Roland Scheidegger [Wed, 2 Dec 2009 15:55:33 +0000 (16:55 +0100)]
gallium: adapt nv drivers to interface cleanups
Jakob Bornecrantz [Wed, 2 Dec 2009 13:56:56 +0000 (14:56 +0100)]
Merge branch 'mesa_7_7_branch'
José Fonseca [Thu, 3 Dec 2009 18:18:46 +0000 (18:18 +0000)]
util: Fix generated swizzle comments.
Michal Krol [Thu, 3 Dec 2009 08:13:52 +0000 (09:13 +0100)]
tgsi/ureg: Fix ureg_emit_src().
Corbin Simpson [Wed, 2 Dec 2009 20:54:51 +0000 (12:54 -0800)]
radeong: Clean up some bad code.
Corbin Simpson [Wed, 2 Dec 2009 20:42:58 +0000 (12:42 -0800)]
radeong: Add helper to determine pipe driver.
Corbin Simpson [Wed, 2 Dec 2009 20:31:04 +0000 (12:31 -0800)]
radeong: Do ioctls before selecting pipe driver.
Corbin Simpson [Wed, 2 Dec 2009 20:16:19 +0000 (12:16 -0800)]
r300g, radeong: De-specialize r300_winsys into radeon_winsys.
There's like five good reasons for this, I swear.
Corbin Simpson [Wed, 2 Dec 2009 19:34:00 +0000 (11:34 -0800)]
radeong: Change ioctl order, document it.
Corbin Simpson [Wed, 2 Dec 2009 19:22:55 +0000 (11:22 -0800)]
r300g: No vertex textures here.
Brian Paul [Wed, 2 Dec 2009 19:24:24 +0000 (12:24 -0700)]
cso: check if pipe_context::bind_vertex_sampler_states is non-null
Fixes segfaults upon exit when the CSO module is releasing its objects.
Brian Paul [Wed, 2 Dec 2009 19:20:15 +0000 (12:20 -0700)]
Revert "llvmpipe: plug in dummy pipe_context::set_vertex_sampler_textures function"
This reverts commit
792888121b92913733daec7526c9441f27ce1231.
We're instead returning 0 for the PIPE_CAP_MAX_VERTEX_TEXTURE_UNITS query.
Brian Paul [Wed, 2 Dec 2009 19:19:31 +0000 (12:19 -0700)]
llvmpipe: return 0 for PIPE_CAP_MAX_VERTEX_TEXTURE_UNITS query
The driver (and draw module) don't support vertex shader textures yet.
Brian Paul [Wed, 2 Dec 2009 17:09:53 +0000 (10:09 -0700)]
llvmpipe: plug in dummy pipe_context::set_vertex_sampler_textures function
Fixes immediate segfault.
Brian Paul [Wed, 2 Dec 2009 16:23:37 +0000 (09:23 -0700)]
cell: fix TGSI breakage
Brian Paul [Wed, 2 Dec 2009 16:23:15 +0000 (09:23 -0700)]
gallium/util: __builtin_bswap32() is in only gcc 4.3 or later
Brian Paul [Wed, 2 Dec 2009 16:22:42 +0000 (09:22 -0700)]
gallium/util: added PIPE_CC_GCC_VERSION symbol
Jakob Bornecrantz [Wed, 2 Dec 2009 13:52:51 +0000 (14:52 +0100)]
Merge commit 'mesa_7_6_branch' into mesa_7_7_branch
Conflicts:
src/mesa/main/version.h
Alex Deucher [Thu, 3 Dec 2009 16:20:40 +0000 (11:20 -0500)]
r200: fix polygon stipple
fixes fdo bug 25354
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Vinson Lee [Tue, 8 Sep 2009 11:31:42 +0000 (12:31 +0100)]
scons: Add Mac OS to target platform list.
(cherry picked from commit
2c307c775018e5b9680de8022ddf0ce3b6f560be)
Vinson Lee [Fri, 20 Nov 2009 07:56:07 +0000 (23:56 -0800)]
progs/vpglsl: Fix psiz-mul.glsl compilation error on Mac OS.
(cherry picked from commit
b98db7bf697c3ed6e6df303e9dd66f7ac31eb3e2)
Vinson Lee [Wed, 18 Nov 2009 22:02:20 +0000 (14:02 -0800)]
progs/glsl: Fix trirast GLSL compilation errors on Mac OS.
(cherry picked from commit
4b3ec2acf2cc2830b0907e4fb4db8bd1ff4a18e3)
Vinson Lee [Wed, 18 Nov 2009 21:50:49 +0000 (13:50 -0800)]
progs/glsl: Fix noise GLSL compilation error on Mac OS.
(cherry picked from commit
0d31990b4742eccdf6ae6a3b3e16c81cc863085d)
Vinson Lee [Thu, 12 Nov 2009 01:39:58 +0000 (17:39 -0800)]
demos/glsl: Add missing break statement to noise test.
(cherry picked from commit
7dfea5c0722e9da101805c15b9dd26352816bca9)
Vinson Lee [Wed, 18 Nov 2009 20:49:31 +0000 (12:49 -0800)]
progs/glsl: Fix multinoise GLSL compilation errors on Mac OS.
(cherry picked from commit
d4dc2e30dada1be425e95ba270920db6eb210982)
Vinson Lee [Fri, 13 Nov 2009 00:20:23 +0000 (16:20 -0800)]
progs/glsl: Add missing break statement in multinoise.c.
(cherry picked from commit
43080e40aa0d34423e10f1d50aad15289b2b9aec)
Vinson Lee [Wed, 18 Nov 2009 07:15:25 +0000 (23:15 -0800)]
progs/glsl: Fix mandelbrot GLSL compilation error on Mac OS.
(cherry picked from commit
04442841fb7e9138eb50ff692952ad7e8c3877d8)
Vinson Lee [Mon, 21 Sep 2009 14:44:53 +0000 (08:44 -0600)]
progs/glsl: Include local headers before installed headers during compilation.
Fixes compilation errors on platforms with insufficient older installed
GL headers.
(cherry picked from commit
d17af7d1e19e637e29db47bd8f6e3e579760c530)
Brian Paul [Wed, 16 Sep 2009 21:49:33 +0000 (15:49 -0600)]
progs/glsl: minor Makefile clean-ups
(cherry picked from commit
4df2f7af5e9b2c00ead92fe0ae49ed8491aef1d0)
Eric Anholt [Wed, 2 Dec 2009 21:00:15 +0000 (13:00 -0800)]
intel: Make RGB renderbuffers use XRGB8888 like we do for RGB system buffers.
Eric Anholt [Wed, 2 Dec 2009 20:42:36 +0000 (12:42 -0800)]
mesa: Fix bad conversion in AL1616_REV texstore.
Eric Anholt [Wed, 2 Dec 2009 20:15:46 +0000 (12:15 -0800)]
mesa: Fix copy'n'paste problem in al1616 texel fetch.
Vinson Lee [Sun, 15 Nov 2009 05:36:18 +0000 (21:36 -0800)]
progs: Ignore Mac OS dSYM directories.
(cherry picked from commit
a420056750908f7c2f9a7c18b3ab20f04e49711d)
Brian Paul [Wed, 2 Dec 2009 16:31:26 +0000 (09:31 -0700)]
cell: added tex_usage param to xm_surface_buffer_create()
Roland Scheidegger [Wed, 2 Dec 2009 01:08:26 +0000 (02:08 +0100)]
gallium: adapt drivers to interface cleanups
Brian Paul [Thu, 19 Nov 2009 16:55:08 +0000 (09:55 -0700)]
mesa: added comment for target_enum_to_index()
Brian Paul [Mon, 30 Nov 2009 16:21:49 +0000 (09:21 -0700)]
softpipe: setup machine->Face without a conditional
Brian Paul [Mon, 30 Nov 2009 16:54:27 +0000 (09:54 -0700)]
progs/demos: remove unused glFogCoordPointer_ext var
Tom Fogal [Tue, 24 Nov 2009 23:46:31 +0000 (16:46 -0700)]
Simplify hackery added to fix AIX build.
Borrow an idiom from the GNU build system which can handle `for'
loops over empty lists.
Ian Romanick [Tue, 24 Nov 2009 19:59:23 +0000 (11:59 -0800)]
intel: Remove GL_NV_point_sprite from extension list
i830 does not (and cannot!) support the any of the non-default
GL_POINT_SPRITE_R_MODE_NV settings. i915 and i965 could, but
currently do not. In both cases it would require mucking about with
the fragment shader.
Jakob Bornecrantz [Tue, 1 Dec 2009 16:13:41 +0000 (17:13 +0100)]
vmware/xorg: Add video support
By using the hooks st/xorg provides us we can create a driver
specific implementation that uses the svga overlay engines.
Jakob Bornecrantz [Tue, 24 Nov 2009 22:51:05 +0000 (23:51 +0100)]
vmware/xorg: Create a small driver that sits ontop of st/xorg
Jakob Bornecrantz [Tue, 24 Nov 2009 21:55:24 +0000 (22:55 +0100)]
st/xorg: Create winsys hooks that we call into
Jakob Bornecrantz [Tue, 1 Dec 2009 16:00:43 +0000 (17:00 +0100)]
vmware/core: Update vmwgfx_drm.h to latest version
Jakob Bornecrantz [Tue, 24 Nov 2009 23:33:43 +0000 (00:33 +0100)]
svga: Add header files for overlay support
Eric Anholt [Wed, 2 Dec 2009 19:56:18 +0000 (11:56 -0800)]
intel: Fix more front-buffer rendering after Brian's less flushing patch.
bcbfda71b03303d3f008a6f3cf8cb7d9667bf8d2 left out many blit paths.
This fixes up more of them to get Blender to work again.
Bug #25030.
José Fonseca [Wed, 2 Dec 2009 17:05:20 +0000 (17:05 +0000)]
wgl: Call st_swapbuffers instead of st_notify_swapbuffers.
This will get single buffer, double buffer, and
joint single/double buffer (typical in CAD applications) done right,
at least as far as the frambuffer is concerned.
There are still problems with multiple contexts using the same
framebuffer because st_framebuffer_* calls assume the framebuffer
is bound to a single context.
Dave Airlie [Wed, 2 Dec 2009 01:01:19 +0000 (11:01 +1000)]
Revert "radeon/r300: no need to flush the cmdbuf when changing scissors state in KMM mode"
This reverts commit
286bf89e5a1fc931dbf523ded861b809859485e2.
This doesn't appear to be correct, regression so revert it.
http://bugs.freedesktop.org/show_bug.cgi?id=25193
Brian Paul [Tue, 1 Dec 2009 20:26:15 +0000 (13:26 -0700)]
vbo: make flush recursion check code per-context
This fixes invalid failed assertions when running multi-threaded apps.
Brian Paul [Mon, 30 Nov 2009 15:41:37 +0000 (08:41 -0700)]
st/mesa: updated emit_swz() comment
Keith Whitwell [Tue, 1 Dec 2009 15:01:00 +0000 (15:01 +0000)]
tgsi: fix ureg emit after version token change
Keith Whitwell [Tue, 1 Dec 2009 14:54:32 +0000 (14:54 +0000)]
st/xorg: fix merge droppings
These were stranded in emacs and not saved before committing.
Keith Whitwell [Tue, 1 Dec 2009 14:31:14 +0000 (14:31 +0000)]
Merge commit 'origin/tgsi-simplify-ext'
Conflicts:
src/gallium/drivers/r300/r300_vs.c
Keith Whitwell [Tue, 1 Dec 2009 10:57:37 +0000 (10:57 +0000)]
Merge commit 'origin/mesa_7_7_branch'
Conflicts:
src/gallium/drivers/svga/svga_screen_texture.c
src/gallium/state_trackers/xorg/xorg_composite.c
src/gallium/state_trackers/xorg/xorg_exa.c
src/gallium/state_trackers/xorg/xorg_renderer.c
src/gallium/state_trackers/xorg/xorg_xv.c
src/mesa/main/texgetimage.c
src/mesa/main/version.h
Michal Krol [Tue, 1 Dec 2009 10:19:33 +0000 (11:19 +0100)]
mesa: Update vertex texture code after gallium changes.
Marek Olšák [Fri, 27 Nov 2009 09:19:20 +0000 (10:19 +0100)]
r300g: simplify allocations of VS output registers
No need to parse TGSI tokens since it's easier to walk through shader
semantics.
Also fog coordinates now work reliably.
Marek Olšák [Fri, 27 Nov 2009 05:36:31 +0000 (06:36 +0100)]
r300g: simplify allocations of FS input registers
Marek Olšák [Thu, 26 Nov 2009 18:37:58 +0000 (19:37 +0100)]
r300g: clean up derived states
The state setups which aren't derived anymore have been moved to the VS
and FS objects.
Marek Olšák [Thu, 26 Nov 2009 12:49:41 +0000 (13:49 +0100)]
r300g: VS->FS attribute routing rework
Now it always correctly pairs up VS and FS even if the semantics and indices
of VS outputs and FS inputs don't match.
Marek Olšák [Tue, 24 Nov 2009 23:24:28 +0000 (00:24 +0100)]
r300g: add R300 prefix in reg definitions
Michal Krol [Tue, 1 Dec 2009 09:07:15 +0000 (10:07 +0100)]
cso: Fix function prototype.
Michal Krol [Tue, 1 Dec 2009 08:50:38 +0000 (09:50 +0100)]
trace: Implement separate vertex sampler state.
Michal Krol [Tue, 1 Dec 2009 08:39:08 +0000 (09:39 +0100)]
fo: Implement separate vertex sampler state.
Michal Krol [Tue, 1 Dec 2009 08:01:27 +0000 (09:01 +0100)]
id: Implement separate vertex sampler state.
Michal Krol [Tue, 1 Dec 2009 07:54:30 +0000 (08:54 +0100)]
trace: Reduce double semicolons to single ones.
Michal Krol [Tue, 1 Dec 2009 07:52:37 +0000 (08:52 +0100)]
sp: Do not falsely advertise support for some SNORM formats.
Michal Krol [Tue, 1 Dec 2009 07:51:20 +0000 (08:51 +0100)]
sp: Implement separate vertex sampler state.
Michal Krol [Tue, 1 Dec 2009 07:47:00 +0000 (08:47 +0100)]
python: Update for renamed sampler/texture state setters.
Michal Krol [Tue, 1 Dec 2009 07:44:18 +0000 (08:44 +0100)]
st: Update for renamed sampler/texture state setters.
Michal Krol [Tue, 1 Dec 2009 07:43:51 +0000 (08:43 +0100)]
trace: Update for renamed sampler/texture state setters.
Michal Krol [Tue, 1 Dec 2009 07:40:53 +0000 (08:40 +0100)]
svga: Update for renamed sampler/texture state setters.
Michal Krol [Tue, 1 Dec 2009 07:40:31 +0000 (08:40 +0100)]
r300: Update for renamed sampler/texture state setters.
Michal Krol [Tue, 1 Dec 2009 07:40:21 +0000 (08:40 +0100)]
nv: Update for renamed sampler/texture state setters.
Michal Krol [Tue, 1 Dec 2009 07:40:04 +0000 (08:40 +0100)]
lp: Update for renamed sampler/texture state setters.
Michal Krol [Tue, 1 Dec 2009 07:39:49 +0000 (08:39 +0100)]
id: Update for renamed sampler/texture state setters.
Michal Krol [Tue, 1 Dec 2009 07:39:19 +0000 (08:39 +0100)]
i915: Update for renamed sampler/texture state setters.
Michal Krol [Tue, 1 Dec 2009 07:39:07 +0000 (08:39 +0100)]
fo: Update for renamed sampler/texture state setters.
Michal Krol [Tue, 1 Dec 2009 07:38:32 +0000 (08:38 +0100)]
cell: Update for renamed sampler/texture state setters.
Michal Krol [Tue, 1 Dec 2009 07:38:06 +0000 (08:38 +0100)]
vl: Update for renamed sampler/texture state setters.
Michal Krol [Tue, 1 Dec 2009 07:37:15 +0000 (08:37 +0100)]
draw: Update for renamed sampler/texture state setters.
Michal Krol [Tue, 1 Dec 2009 07:35:43 +0000 (08:35 +0100)]
cso: Add support for separate vertex sampler state.
Michal Krol [Tue, 1 Dec 2009 07:33:43 +0000 (08:33 +0100)]
gallium: Introduce separate vertex texture/sampler state.
Previously, gallium shared sampler and texture state between vertex
and fragment shader stages. This change generalises this concept by
providing separate entrypoints for vertex and fragment sampler state
setting.
A new capability bit is added to query the driver for the number
of samplers that can be utilised by a vertex and fragment shader
at the same time.
Michal Krol [Fri, 27 Nov 2009 11:33:17 +0000 (12:33 +0100)]
tgsi/sanity: Up MAX_REGISTERS to 1024.
Ian Romanick [Tue, 1 Dec 2009 01:56:07 +0000 (17:56 -0800)]
mesa: set version string to 7.7-rc1
Ian Romanick [Tue, 1 Dec 2009 01:55:21 +0000 (17:55 -0800)]
mesa: set version string to 7.6.1-rc2
Ian Romanick [Tue, 1 Dec 2009 01:47:07 +0000 (17:47 -0800)]
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
Conflicts:
progs/util/shaderutil.c
src/mesa/drivers/dri/r600/r600_context.c
src/mesa/main/version.h
Roland Scheidegger [Mon, 30 Nov 2009 22:02:49 +0000 (23:02 +0100)]
fixups for interface changes (mostly state trackers)
Ian Romanick [Mon, 30 Nov 2009 20:43:12 +0000 (12:43 -0800)]
i915: Actually put i915PointParameterfv in the driver function table. Duh.
Roland Scheidegger [Mon, 30 Nov 2009 19:29:18 +0000 (20:29 +0100)]
gallium: interface cleanups, remove nblocksx/y from pipe_texture and more
This patch removes nblocksx, nblocksy arrays from pipe_texture (can be
recalculated if needed). Furthermore, pipe_format_block struct is gone
completely (again, contains just derived state).
nblocksx, nblocksy, block are also removed from pipe_transfer, together with
the format enum (can be obtained from the texture associated with the transfer).
Brian Paul [Mon, 30 Nov 2009 15:56:47 +0000 (08:56 -0700)]
st/mesa: handle front/back-face +1/-1 vs. 1/0 conversion
Fixes progs/glsl/twoside.c demo.
Vinson Lee [Mon, 30 Nov 2009 02:17:44 +0000 (21:17 -0500)]
mesa: Fix array out-of-bounds access by _mesa_TexParameterf.
_mesa_TexParameterf calls set_tex_parameterf, which uses the params
argument as an array.
Ian Romanick [Mon, 30 Nov 2009 01:49:55 +0000 (17:49 -0800)]
i915: Fallback bit define missed on previous commit
Ian Romanick [Mon, 30 Nov 2009 01:43:38 +0000 (17:43 -0800)]
i915: Round point sizes instead of truncate.
Ian Romanick [Mon, 30 Nov 2009 01:40:02 +0000 (17:40 -0800)]
i915: Enable point sprite coordinate generation
Support still isn't completely correct, but it's better. piglit
point-sprite now passes. However, glean's pointSprite test fails. In
that test the texture on the sprite is somehow inverted as though
GL_POINT_SPRITE_COORD_ORIGIN were set to GL_LOWER_LEFT. i915 hardware
shouldn't be able to do that!
I believe there are also problems when not all texture units have
GL_COORD_REPLACE set. The hardware enable seems to be all or nothing.
Fixes bug #25313.
Vinson Lee [Sun, 29 Nov 2009 23:18:23 +0000 (18:18 -0500)]
mesa: Fix array out-of-bounds access by _mesa_TexParameterf.
_mesa_TexParameterf calls set_tex_parameteri, which uses the params
argument as an array.