Ian Romanick [Tue, 15 Dec 2009 20:38:01 +0000 (12:38 -0800)]
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
Conflicts:
src/gallium/drivers/softpipe/sp_quad_blend.c
Ian Romanick [Tue, 15 Dec 2009 20:14:04 +0000 (12:14 -0800)]
intel: Fallback to software if drawable size is > MaxRenderbufferSize
This prevents the mystery blank window if, for example, glxgears is
resized larger than 2048 wide on 915. Since the Intel drivers in Mesa
7.6 lack GTT mapped fallbacks, the performance is a slideshow at
best. On Mesa 7.7 and later the performance is much better.
Vinson Lee [Tue, 15 Dec 2009 20:32:48 +0000 (12:32 -0800)]
x86: ifdef out unused function cptr.
Matthew Bell [Tue, 15 Dec 2009 04:58:19 +0000 (21:58 -0700)]
mesa: Add missing $(DESTDIR) support to src/gallium/winsys/xlib/Makefile
Vinson Lee [Tue, 15 Dec 2009 02:11:57 +0000 (18:11 -0800)]
progs/trivial: Silence compiler warnings.
Vinson Lee [Tue, 15 Dec 2009 01:30:15 +0000 (17:30 -0800)]
mga: Silence uninitialized variable warnings.
Vinson Lee [Tue, 15 Dec 2009 01:20:34 +0000 (17:20 -0800)]
mach64: Silence uninitialized variable warnings.
Ian Romanick [Tue, 15 Dec 2009 00:16:26 +0000 (16:16 -0800)]
i965: Use current draw buffer instead of drawable visual to get alpha bits
Use the currently bound draw buffer instead of the visual from the
drawable used to create the context. This cause problems generating
mipmaps for an RGBA texture in an RGB context.
This fixes the failure in piglit's glsl-lod-bias test reported in bug #25614.
Jakob Bornecrantz [Mon, 14 Dec 2009 21:27:08 +0000 (22:27 +0100)]
vmwgfx: Update vmwgfx_drm.h to the on upstream
Jakob Bornecrantz [Mon, 14 Dec 2009 21:11:17 +0000 (22:11 +0100)]
vmware/xorg: Use new stream ioctl
Brian Paul [Mon, 14 Dec 2009 20:35:56 +0000 (13:35 -0700)]
mesa/meta: move BindTexture() call in _mesa_meta_GenerateMipmap()
This is a follow-up to commit
e3fa700c178e11e6735430119232919176ab7b42.
The call to _mesa_BindTexture() must be before we set any other texture
object state, namely the _mesa_TexParameteri() calls.
This fixes bug 25601 (piglit gen-nonzero-unit failure).
Vinson Lee [Sun, 13 Dec 2009 08:14:31 +0000 (00:14 -0800)]
i810: Silence uninitialized variable warnings in i180tris.c
Vinson Lee [Sun, 13 Dec 2009 07:47:32 +0000 (23:47 -0800)]
swrast: Silence uninitialized variable warnings in s_triangle.c
Vinson Lee [Sun, 13 Dec 2009 06:17:16 +0000 (22:17 -0800)]
st/mesa: Silence uninitialized variables warnings in st_draw.c.
Vinson Lee [Sun, 13 Dec 2009 06:00:19 +0000 (22:00 -0800)]
swrast: Silence uninitialized variable warnings in ss_tritmp.h.
Vinson Lee [Sun, 13 Dec 2009 05:46:13 +0000 (21:46 -0800)]
glut: Prevent potential double free in menuVisualSetup.
Vinson Lee [Sun, 13 Dec 2009 04:20:02 +0000 (20:20 -0800)]
t_dd_dmatmp.h: Silence unused value warning in render_poly_elts.
Vinson Lee [Sun, 13 Dec 2009 02:42:18 +0000 (18:42 -0800)]
glsl: Initialize member label of struct slang_operation to NULL.
Vinson Lee [Sun, 13 Dec 2009 02:34:15 +0000 (18:34 -0800)]
softpipe: Initialize source in blend_quad.
Vinson Lee [Sun, 13 Dec 2009 00:56:07 +0000 (16:56 -0800)]
t_dd_dmatmp2.h: Silence unused value warnings.
Vinson Lee [Sun, 13 Dec 2009 00:24:25 +0000 (16:24 -0800)]
i915g: Silence unused value warning in intel_drm_get_device_id.
Vinson Lee [Sun, 13 Dec 2009 00:18:08 +0000 (16:18 -0800)]
t_dd_dmatmp.h: Silence unused value warnings in render_line_loop_elts.
Vinson Lee [Sun, 13 Dec 2009 00:02:09 +0000 (16:02 -0800)]
t_dd_dmatmp.h: Silence unused value warning in render_tri_fan_elts.
Vinson Lee [Sat, 12 Dec 2009 23:47:17 +0000 (15:47 -0800)]
progs/trivial: Silence compiler warnings in tri-blend-min.c.
Vinson Lee [Sat, 12 Dec 2009 23:27:30 +0000 (15:27 -0800)]
t_dd_dmatmp.h: Silence unused value warning in render_poly_verts.
Vinson Lee [Sat, 12 Dec 2009 23:08:01 +0000 (15:08 -0800)]
swrast: Initialize tex_coords in handle_sample_op.
Vinson Lee [Sat, 12 Dec 2009 22:41:35 +0000 (14:41 -0800)]
t_dd_dmatmp.h: Silence unused value warning in render_quads_verts.
Vinson Lee [Sat, 12 Dec 2009 22:20:17 +0000 (14:20 -0800)]
progs/trivial: Silence compiler warnings in tri-blend-max.c
Vinson Lee [Sat, 12 Dec 2009 21:39:39 +0000 (13:39 -0800)]
t_dd_dmatmp.h: Silence unused value warning in render_tri_fan_verts.
Vinson Lee [Sat, 12 Dec 2009 20:52:02 +0000 (12:52 -0800)]
t_dd_dmatmp.h: Silence unused value warning in render_line_loop_verts.
Jakob Bornecrantz [Sat, 12 Dec 2009 19:02:34 +0000 (20:02 +0100)]
vmware/xorg: Fix failure paths and add some debug printing
Jakob Bornecrantz [Sat, 12 Dec 2009 17:30:56 +0000 (18:30 +0100)]
vmwgfx/core: Check for 3D via the get param ioctl
Vinson Lee [Sat, 12 Dec 2009 10:06:51 +0000 (02:06 -0800)]
progs/xdemos: Silence compiler warnings in glxinfo.c.
Vinson Lee [Sat, 12 Dec 2009 09:34:33 +0000 (01:34 -0800)]
progs/tests: Silence compiler warnings in vpeval.c.
Vinson Lee [Sat, 12 Dec 2009 09:11:56 +0000 (01:11 -0800)]
progs/tests: Silence compiler warnings in cva.c.
Vinson Lee [Sat, 12 Dec 2009 09:02:16 +0000 (01:02 -0800)]
progs/redbook: Silence compiler warnings in aaindex.c.
Vinson Lee [Sat, 12 Dec 2009 08:33:42 +0000 (00:33 -0800)]
t_dd_dmatmp.h: Silence unused value warning in render_line_loop_verts.
Maciej Cencora [Sat, 12 Dec 2009 01:02:53 +0000 (02:02 +0100)]
radeon: fix #25463
This is just a workaroung until we properly fix texture mapping in radeonSpanRenderStart
Maciej Cencora [Fri, 11 Dec 2009 22:56:47 +0000 (23:56 +0100)]
r300: fix depth textures
Brian Paul [Fri, 11 Dec 2009 16:51:27 +0000 (09:51 -0700)]
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
Brian Paul [Fri, 11 Dec 2009 16:41:34 +0000 (09:41 -0700)]
docs: updated 7.6.1 relnotes with GLSL fixes
Brian Paul [Fri, 11 Dec 2009 16:40:33 +0000 (09:40 -0700)]
mesa: remove unnecessary loop in _mesa_remove_output_reads()
Brian Paul [Fri, 11 Dec 2009 16:22:00 +0000 (09:22 -0700)]
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
Brian Paul [Fri, 11 Dec 2009 16:16:25 +0000 (09:16 -0700)]
mesa: check dst reg in _mesa_find_free_register()
If a register was only being used as a destination (as will happen when
generated condition-codes) we missed its use. So we'd errantly return
a register index that was really in-use, not free.
Fixes bug 25579.
Aurelien Jarno [Fri, 11 Dec 2009 15:46:54 +0000 (08:46 -0700)]
sparc: additional preprocessor test for SPARC 64-bit
José Fonseca [Fri, 11 Dec 2009 15:16:22 +0000 (15:16 +0000)]
scons: Tweak MSVC release options.
Enable whole program optimizations and fast math.
José Fonseca [Fri, 11 Dec 2009 14:14:03 +0000 (14:14 +0000)]
svga: Add a missing dependency from the prescale state.
Thanks for Keith to finding this.
Fixes Jedi Knight 2 menus.
José Fonseca [Fri, 11 Dec 2009 13:15:12 +0000 (13:15 +0000)]
svga: Always pass SVGA3D_SURFACE_HINT_DYNAMIC.
Since we're reusing buffers we're effectively transforming all
of them into dynamic buffers.
It would be nice to not cache long lived static buffers. But there
is no way to detect the long lived from short lived ones yet. A
good heuristic would be buffer size.
José Fonseca [Fri, 11 Dec 2009 12:29:02 +0000 (12:29 +0000)]
svga: Keep tight control of texture handle ownership.
The texture owns the surface handle. All derivatives need to keep
a reference to texture.
This fixes several assertions failures starting up Jedi Knight 2.
Should cause no change for DRM surface sharing -- reference count still
done as before there.
José Fonseca [Fri, 11 Dec 2009 12:09:02 +0000 (12:09 +0000)]
svga: Fix mixed signed comparisons.
José Fonseca [Fri, 11 Dec 2009 12:08:32 +0000 (12:08 +0000)]
scons: Pass -fno-strict-aliasing to gcc.
Strict aliasing tule violations were fixed on master, but
they're still causing problem in this branch, so disable this assumptions.
Do not apply this fix to master (revert when you merge).
José Fonseca [Wed, 25 Nov 2009 18:06:12 +0000 (18:06 +0000)]
scons: Make it work with MinGW build of LLVM 2.6.
LLVM 2.5 is no longer supported on windows.
Vinson Lee [Fri, 11 Dec 2009 02:51:51 +0000 (18:51 -0800)]
mesa: Initialize variable in MatchInstruction.
Vinson Lee [Fri, 11 Dec 2009 02:32:33 +0000 (18:32 -0800)]
mesa: Assign _mesa_lookup_parameter_index return value to GLint.
Vinson Lee [Fri, 11 Dec 2009 02:21:59 +0000 (18:21 -0800)]
i915: Add missing break statement in i915_debug_packet.
Vinson Lee [Fri, 11 Dec 2009 01:50:35 +0000 (17:50 -0800)]
glsl: Increase size of array in_slang_lookup_constant from 4 to 16.
For some cases, _mesa_GetIntegerv reads up to params[15].
Vinson Lee [Thu, 10 Dec 2009 23:41:13 +0000 (15:41 -0800)]
progs/samples: Byte swap individual members of struct _rawImageRec.
Ian Romanick [Wed, 9 Dec 2009 07:25:26 +0000 (23:25 -0800)]
intel: Remove ARGB internal_format == GL_RGB hacks
Now that XRGB is supported, we don't need to hack around cases of an RGBA
format buffer with an internal format of GL_RGB.
Ian Romanick [Wed, 9 Dec 2009 07:24:58 +0000 (23:24 -0800)]
intel: Make RGB textures use XRGB8888
Ian Romanick [Wed, 9 Dec 2009 05:15:36 +0000 (21:15 -0800)]
intel: Make RGB renderbuffers use XRGB8888 like we do for RGB system buffers.
Ian Romanick [Wed, 9 Dec 2009 05:13:05 +0000 (21:13 -0800)]
i965: Fix handling of drawing to MESA_FORMAT_XRGB8888
It turns out that 965 and friends cannot actually render to an xRGB
surfaces. Instead, the surface has to be RGBA with writes to alpha
disabled and the blend function modified to always use 1.0 for
destination alpha.
Ian Romanick [Wed, 9 Dec 2009 05:12:18 +0000 (21:12 -0800)]
intel: Use spantmp2 GL_BGR / GL_UNSIGNED_INT_8_8_8_8_REV for XRGB8888
Ian Romanick [Wed, 9 Dec 2009 05:10:45 +0000 (21:10 -0800)]
spantmp2: Add support for GL_BGR / GL_UNSIGNED_INT_8_8_8_8_REV
This is really for MESA_FORMAT_XRGB8888. Clearly spantmp2.h needs some
re-work. Any volunteers?
Ian Romanick [Wed, 9 Dec 2009 01:03:20 +0000 (17:03 -0800)]
intel: name in intel_create_renderbuffer was always 0, remove
Ian Romanick [Wed, 9 Dec 2009 00:06:13 +0000 (16:06 -0800)]
intel: Use texformat accessor to get bytes-per-pixel
Ian Romanick [Tue, 8 Dec 2009 23:51:18 +0000 (15:51 -0800)]
intel: softwareBuffer in intel_alloc_renderbuffer_storage was always false, remove
Ian Romanick [Tue, 8 Dec 2009 17:57:27 +0000 (09:57 -0800)]
intel: Axe intel_renderbuffer::texformat
Since the texformat branch merge, the value of intel_renderbuffer::texformat
is just a copy of gl_renderbuffer::Format.
Eric Anholt [Wed, 9 Dec 2009 19:36:45 +0000 (11:36 -0800)]
intel: Flush the render/texture cache when finishing render to texture.
Back when we were flushing the entire batch at BindFramebuffer, the kernel
would notice the domain transition when someone went to texture from it and
flush for us. We no longer do the batch flushing every time, so we get to
do aggressive flushing until we move batchbuffer handling to libdrm.
Fixes piglit fbo-flushing. Bug #25377. No noticeable performance loss
on cairo-gl (so this is better than batch flushing).
Vinson Lee [Thu, 10 Dec 2009 21:24:15 +0000 (13:24 -0800)]
progs/util: Byte swap individual members of struct _rawImageRec.
Vinson Lee [Thu, 10 Dec 2009 20:37:10 +0000 (12:37 -0800)]
glsl: Fix array out-of-bounds access by _slang_lookup_constant.
Vinson Lee [Thu, 10 Dec 2009 20:11:09 +0000 (12:11 -0800)]
mesa: Fix array out-of-bounds access by _mesa_TexParameteriv.
Zack Rusin [Thu, 10 Dec 2009 18:01:53 +0000 (13:01 -0500)]
st/xorg: fix yv12 plus some cleanups in the upload code
Zack Rusin [Wed, 18 Nov 2009 17:06:32 +0000 (12:06 -0500)]
st/xorg: enable yv12 for xv
Vinson Lee [Thu, 10 Dec 2009 06:34:07 +0000 (22:34 -0800)]
mesa: Fix SCons build.
Commit
cd6b8dd9e82fedc55d033131fbc0f8ee950567c8 deleted
src/mesa/state_tracker/st_cb_get.c.
Vinson Lee [Thu, 10 Dec 2009 01:59:23 +0000 (17:59 -0800)]
mesa: Fix array out-of-bounds access by _mesa_TexGend.
_mesa_TexGend calls _mesa_TexGenfv, which uses the params argument
as an array.
Vinson Lee [Thu, 10 Dec 2009 01:34:50 +0000 (17:34 -0800)]
mesa: Fix array out-of-bounds access by _mesa_Lighti.
_mesa_Lighti calls _mesa_Lightiv, which uses the params argument
as an array.
Vinson Lee [Thu, 10 Dec 2009 01:11:30 +0000 (17:11 -0800)]
mesa: Fix array out-of-bounds access by _mesa_Lightf.
Vinson Lee [Wed, 9 Dec 2009 21:15:05 +0000 (13:15 -0800)]
mesa: Fix array out-of-bounds access by _mesa_PointParameteri.
_mesa_PointParameteri calls _mesa_PointParameterfv, which uses the
params argument as an array.
Vinson Lee [Wed, 9 Dec 2009 21:00:22 +0000 (13:00 -0800)]
mesa: Fix array out-of-bounds access by _mesa_PointParameterf.
_mesa_PointParameterf calls _mesa_PointParameterfv, which uses the
params argument as an array.
Vinson Lee [Wed, 9 Dec 2009 20:43:28 +0000 (12:43 -0800)]
mesa: Fix array out-of-bounds access by _mesa_LightModelf.
_mesa_LightModelf calls _mesa_LightModelfv, which uses the
params argument as an array.
Vinson Lee [Wed, 9 Dec 2009 19:26:24 +0000 (11:26 -0800)]
glsl: Remove unused member x from struct slang_operation.
Brian Paul [Wed, 9 Dec 2009 15:30:01 +0000 (08:30 -0700)]
mesa: fix baseLevel >= MAX_TEXTURE_LEVELS test
This fixes invalid array indexing when baseLevel == MAX_TEXTURE_LEVELS.
See bug 25528.
Andre Maasikas [Wed, 9 Dec 2009 08:51:52 +0000 (10:51 +0200)]
r600: fix state size prediction after
dc0777d3
Jakob Bornecrantz [Tue, 8 Dec 2009 20:05:30 +0000 (21:05 +0100)]
vmware/xorg: Properly detect overlay support
Jakob Bornecrantz [Tue, 8 Dec 2009 20:03:29 +0000 (21:03 +0100)]
vmware/core: Update vmwgfx_drm.h
Ian Romanick [Wed, 9 Dec 2009 19:03:49 +0000 (11:03 -0800)]
meta: Bind texture to unit 0 for mipmap generation
If the active texture unit on entry to mipmap generation is not zero, bind the
texture to unit zero.
Fixes bug #24219.
Eric Anholt [Wed, 9 Dec 2009 18:08:07 +0000 (10:08 -0800)]
mesa: Move OES_read_format support from drivers into the core.
The assertion is that the correct read type to be using is the native
type of the underlying read renderbuffer. For some fallback paths, this
may be worse than GL_RGBA/GL_UNSIGNED_BYTE for reads today, but it gets
all drivers the expected GL_BGRA/GL_UNSIGNED_BYTE for ARGB8888 or
GL_BGR//GL_UNSIGNED_SHORT_5_6_5_REV for rgb565 with no work.
This fixes the intel (and other) DRI drivers to report read formats that
should hit blit PBO readpixels paths.
Vinson Lee [Wed, 9 Dec 2009 02:26:05 +0000 (18:26 -0800)]
mesa: Fix array out-of-bounds access by _mesa_LightModeli.
_mesa_LightModeli calls _mesa_LightModeliv, which uses the
params argument as an array.
Vinson Lee [Wed, 9 Dec 2009 01:51:07 +0000 (17:51 -0800)]
mesa: Fix array out-of-bounds access by _mesa_Fogf.
_mesa_Fogf calls _mesa_Fogfv, which uses the params argument
as an array.
Vinson Lee [Wed, 9 Dec 2009 01:25:05 +0000 (17:25 -0800)]
mesa: Fix array out-of-bounds access by _mesa_TexParameteri.
_mesa_TexParameteri calls set_tex_parameteri, which uses the
params argument as an array.
Eric Anholt [Wed, 9 Dec 2009 00:15:07 +0000 (16:15 -0800)]
i965: Enable the accelerated ReadPixels path on gen4 along with pre-gen4.
Passes piglit pbo-read-argb8888, and doesn't otherwise regress quick.tests.
Vinson Lee [Wed, 9 Dec 2009 00:04:33 +0000 (16:04 -0800)]
mesa: Fix array out-of-bounds access by _mesa_Fogi.
_mesa_Fogi calls _mesa_Fogfv, which uses the params argument
as an array.
Vinson Lee [Tue, 8 Dec 2009 23:42:13 +0000 (15:42 -0800)]
mesa: Fix array out-of-bounds access by _mesa_TexParameteri.
_mesa_TexParameteri calls set_tex_parameterf, which uses the
params argument as an array.
Vinson Lee [Tue, 8 Dec 2009 22:31:38 +0000 (14:31 -0800)]
mesa: Fix array out-of-bounds access by _mesa_TexParameterfv.
_mesa_TexParameterfv calls set_tex_parameteri, which uses the
params argument as an array.
Brian Paul [Tue, 8 Dec 2009 22:03:15 +0000 (15:03 -0700)]
vbo: fix array index out of bounds error, and fix evaluator priorities
Fixes bug 25525.
Plus, the GL_NV_vertex_program evaluators alias and override the
convential evaluator maps, so set their state after the conventional
maps.
Vinson Lee [Tue, 8 Dec 2009 08:43:38 +0000 (00:43 -0800)]
i915g: Fix memory leak when pci id is unknown.
Vinson Lee [Tue, 8 Dec 2009 08:37:35 +0000 (00:37 -0800)]
i915g: Add missing break statement in i915_debug_packet.
Vinson Lee [Tue, 8 Dec 2009 08:26:37 +0000 (00:26 -0800)]
rbug: Initialize variable in rbug_get_message.
Silences uninitialized variable warning.
Andre Maasikas [Thu, 3 Dec 2009 10:26:44 +0000 (12:26 +0200)]
r600: add support for TXB instruction
makes testing other things easier - does not hang the card
TODO: enable TEX dependency tracking in vertex programs
Andre Maasikas [Wed, 4 Nov 2009 08:00:47 +0000 (10:00 +0200)]
r600: reorder state for render_target and blend
First time around render targets are not enabled yet (done in
r700SendRenderTargetState) so blend state is not emitted for any targets.
Affects first glClear in some mesa tests.
As a quick fix reorder state emit so that target is set first