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)
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()
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.
Ian Romanick [Tue, 1 Dec 2009 01:55:21 +0000 (17:55 -0800)]
mesa: set version string to 7.6.1-rc2
Ian Romanick [Mon, 30 Nov 2009 20:43:12 +0000 (12:43 -0800)]
i915: Actually put i915PointParameterfv in the driver function table. Duh.
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.
Ian Romanick [Thu, 26 Nov 2009 00:31:28 +0000 (16:31 -0800)]
Improve implementation of GL_POINT_SPRITE_COORD_ORIGIN errors
This enum is only supported for OpenGL 2.0. If a driver supports
OpenGL 1.4 and GL_ARB_point_sprite, using this enum should generate an
error. This is important because, for example, i915 and i830 can
support GL_ARB_point_sprite, but they cannot support
GL_POINT_SPRITE_COORD_ORIGIN.
This commit just removes the check for NV_point_sprite, which is
completely wrong, and add some comments describing what the code
should do. I don't see an easy way to check for version >= 2.0 from
inside Mesa. Perhaps we should add an extension
GL_MESA_point_sprite_20 (like Intel's old GL_EXT_packed_pixels_12) to
indicate that this added bit of functionality is available.
Also note that glean's pointSprite test only checks for
GL_ARB_point_sprite before trying to use
GL_POINT_SPRITE_COORD_ORIGIN. Naturally, that fails on
non-2.0 implementations (i.e., Mac OS X on GMA 950).
Dave Airlie [Wed, 25 Nov 2009 10:23:22 +0000 (20:23 +1000)]
radeon: fix context destroy needing lock for flushing.
Thanks to Intel code which I've just stolen pretty much as usual.
This fixes fdo bug 22851 which is a dri1 regression since rewrite.
Tested by: fpiobaf (Fabio) on #radeon
Signed-off-by: Dave Airlie <airlied@redhat.com>
Ian Romanick [Tue, 24 Nov 2009 07:14:49 +0000 (23:14 -0800)]
i915: Initialize Length and Offset fields when mapping a buffer object
This fixes an assertion failure in _mesa_MapBufferARB.
Fixes bugzilla #25253.
Ian Romanick [Tue, 24 Nov 2009 02:32:27 +0000 (18:32 -0800)]
shaderutil: Fix detection of shaders
Check for versions >= 2.0 (because some drivers return 3.0), and return
GL_FALSE if shaders are not detected.
Jakob Bornecrantz [Thu, 15 Oct 2009 00:24:53 +0000 (01:24 +0100)]
autoconf: Fix case for not having package
(cherry picked from commit
5c4bdbd825934fe01330890d360b61caa06fdc8d)
Michel Dänzer [Mon, 23 Nov 2009 18:33:59 +0000 (19:33 +0100)]
Fix the DRI swrast driver for big endian platforms.
Too bad I didn't realize earlier how easy this could be...
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=22767 .
Brian Paul [Thu, 19 Nov 2009 16:35:01 +0000 (09:35 -0700)]
docs: document fixes for AIX
Tom Fogal [Thu, 19 Nov 2009 16:33:21 +0000 (09:33 -0700)]
gl: added mangled glXGetProcAddressARB define
Signed-off-by: Brian Paul <brianp@vmware.com>
Tom Fogal [Thu, 19 Nov 2009 03:19:29 +0000 (20:19 -0700)]
progs: Fix quoting issue with empty set of PROGRAM_DIRS.
Quotes are important to make sure the argument to test -n really
is the empty string, but that requires stringifying PROGRAM_DIRS.
Signed-off-by: Brian Paul <brianp@vmware.com>
Tom Fogal [Thu, 19 Nov 2009 16:18:48 +0000 (09:18 -0700)]
mesa: define 32bit byteswap for AIX.
Fixes `xlib' driver build on AIX.
Signed-off-by: Brian Paul <brianp@vmware.com>
Brian Paul [Thu, 19 Nov 2009 16:07:34 +0000 (09:07 -0700)]
docs: removed VC6/7 project files
Brian Paul [Thu, 19 Nov 2009 16:07:17 +0000 (09:07 -0700)]
docs: update news file for 7.6.1 release
Brian Paul [Thu, 19 Nov 2009 16:01:48 +0000 (09:01 -0700)]
docs: remove VC6/7 project file info
Brian Paul [Thu, 19 Nov 2009 16:00:14 +0000 (09:00 -0700)]
mesa: omit VC6, VC7 project files from tarballs
Only VC8 project file is known to work.
Brian Paul [Thu, 19 Nov 2009 15:57:39 +0000 (08:57 -0700)]
windows: remove old VC6 project files directory
Very out of date, according to Karl Schultz.
Alex Deucher [Wed, 18 Nov 2009 16:51:20 +0000 (11:51 -0500)]
r600: disable compressed texture support
It's not implemented yet. fixes fdo bug 24047
Alex Deucher [Wed, 18 Nov 2009 16:32:55 +0000 (11:32 -0500)]
docs: Add note about r600
Alex Deucher [Wed, 18 Nov 2009 16:27:36 +0000 (11:27 -0500)]
Revert "radeon: Fix legacy bo not to reuse dma buffers before refcount is 1."
This reverts commit
284a7af274bc148f112bd0ebb40583923ee26b49.
This breaks kde desktop effects. See fdo bug 24131
Brian Paul [Wed, 18 Nov 2009 15:08:25 +0000 (08:08 -0700)]
mesa: set version string to 7.6.1-rc1
Brian Paul [Wed, 18 Nov 2009 15:07:56 +0000 (08:07 -0700)]
xorg/st: fixup builds against later dpms headers.
(cherry picked from master, commit
e9d6ab72be065becf7a077c33919d37faa8db92e)
Brian Paul [Tue, 17 Nov 2009 22:53:27 +0000 (15:53 -0700)]
docs: i965 clipping fix
Eric Anholt [Thu, 12 Nov 2009 17:08:50 +0000 (09:08 -0800)]
i965: Fix Ironlake shadow comparisons.
The cube map array index arg is always present.
Eric Anholt [Wed, 11 Nov 2009 22:49:03 +0000 (14:49 -0800)]
i965: Fix VBO last-valid-offset setup on Ironlake.
Instead of doing math based on the (broken for VBO && offset != 0)
input->count number, just use the BO size. Fixes assertion failure in ETQW.
Roland Scheidegger [Thu, 12 Nov 2009 01:57:56 +0000 (17:57 -0800)]
i965: fix EXT_provoking_vertex support
This didn't work for quad/quadstrips at all, and for all other primitive types
it only worked when they were unclipped.
Fix up the former in gs stage (could probably do without these changes and
instead set QuadsFollowProvokingVertexConvention to false), and the rest in
clip stage.
Eric Anholt [Tue, 10 Nov 2009 22:11:46 +0000 (14:11 -0800)]
i965: Fix VS constant buffer value loading.
Previously, we'd load linearly from ParameterValues[0] for the constants,
though ParameterValues[1] may not equal ParameterValues[0] + 4. Additionally,
the STATE_VAL type paramters didn't get updated.
Fixes piglit vp-constant-array-huge.vpfp and ET:QW object locations.
Bug #23226.
Eric Anholt [Tue, 10 Nov 2009 18:54:15 +0000 (10:54 -0800)]
i965: Unalias src/dst registers for SGE and friends.
Fixes piglit vp-sge-alias test, and the googleearth ground shader. \o/
Bug #22228
(cherry picked from commit
56ab92bad8f1d05bc22b8a8471d5aeb663f220de)
Eric Anholt [Tue, 10 Nov 2009 18:43:19 +0000 (10:43 -0800)]
i965: Allow use of PROGRAM_LOCAL constants in ARB_vp.
Fixes piglit arl.vp.
(cherry picked from commit
d52d78b4bcd6d4c0578f972c0b8ebac09e632196)
Alex Deucher [Mon, 9 Nov 2009 16:36:10 +0000 (11:36 -0500)]
r600: don't emit htile regs
These are needed for HiZ which is not currently used and
the _BASE reg requires a reloc which is not currently supported
in the drm.
Ian Romanick [Mon, 2 Nov 2009 22:10:38 +0000 (14:10 -0800)]
prog parse: Handle GL_VERTEX_PROGRAM_ARB in glLoadProgramNV
Ian Romanick [Mon, 2 Nov 2009 22:08:51 +0000 (14:08 -0800)]
prog parse: Handle GL_VERTEX_PROGRAM_NV in glProgramStringARB
Handle both NV vertex programs and NV vertex state programs passed to
glProgramStringARB.
Ian Romanick [Mon, 2 Nov 2009 21:38:15 +0000 (13:38 -0800)]
prog parse: Handle GL_FRAGMENT_PROGRAM_ARB in glLoadProgramNV
Ian Romanick [Mon, 2 Nov 2009 21:37:47 +0000 (13:37 -0800)]
prog parse: Handle GL_FRAGMENT_PROGRAM_NV in glProgramStringARB
Ian Romanick [Fri, 6 Nov 2009 22:52:49 +0000 (14:52 -0800)]
GLX: Change GLX client vendor string to "Mesa Project and SGI"
This change allows a certain closed-source browser plug-in to work
with open-source drivers.
Ian Romanick [Thu, 5 Nov 2009 22:20:16 +0000 (14:20 -0800)]
ARB prog parser: Regenerate parser from previous commits.
Ian Romanick [Thu, 5 Nov 2009 22:17:07 +0000 (14:17 -0800)]
ARB prog parser: Release old program string in _mesa_parse_arb_{fragment,vertex}_program
The program structure passed to _mesa_parse_arb_program is just a
place holder. The stings that actually need to be released are only
known to the functions calling _mesa_parse_arb_program, so they should
be freed there.
Ian Romanick [Thu, 5 Nov 2009 22:15:56 +0000 (14:15 -0800)]
ARB prog parser: Release strings returned from the lexer that don't need to be kept
Ian Romanick [Wed, 4 Nov 2009 20:03:44 +0000 (12:03 -0800)]
Revert "ARB prog parser: Fix epic memory leak in lexer / parser interface"
This reverts commit
93dae6761bc90bbd43b450d2673620ec189b2c7a.
This change was completely broken when the parser uses multiple
strings in a single production. It would be nice if bug fixes could
initially land somewhere other than the stable branch.
Brian Paul [Thu, 5 Nov 2009 23:48:50 +0000 (16:48 -0700)]
xmesa: pass pixmap to clip_for_xgetimage()
The code was assuming ctx->DrawBuffer == ctx->ReadBuffer.
Passing the pixmap is simpler and better.
Fixes a potential segfault.
Brian Paul [Thu, 5 Nov 2009 00:58:43 +0000 (17:58 -0700)]
mesa: added cast to silence warning
Brian Paul [Thu, 5 Nov 2009 00:51:21 +0000 (17:51 -0700)]
vbo: fix out-of-bounds array access
The exec->vtx.inputs[] array was being written past its end. This was
clobbering the following vbo_exec_context::eval state. Probably not noticed
since evaluators and immediate mode rendering don't happen at the same time.
Fixed the loop in vbo_exec_vtx_init().
Changed the size of the vbo_exec_context::vtx.arrays[] array.
Added a bunch of debug-build assertions.
Issue found by Vinson Lee.
Brian Paul [Thu, 5 Nov 2009 00:42:30 +0000 (17:42 -0700)]
mesa: fix broken pack_histogram() case for GLhalf
Brian Paul [Thu, 5 Nov 2009 00:42:01 +0000 (17:42 -0700)]
mesa: silence warning from gcc 4.4.1
Vinson Lee [Wed, 4 Nov 2009 22:55:39 +0000 (15:55 -0700)]
progs/tests: Fix MSVC build.
Signed-off-by: Brian Paul <brianp@vmware.com>
Alan Hourihane [Wed, 4 Nov 2009 14:48:25 +0000 (14:48 +0000)]
Fix YTILE spantmp functions
Vinson Lee [Wed, 4 Nov 2009 14:14:55 +0000 (07:14 -0700)]
glslcompiler: Fix Mac OS build.
Signed-off-by: Brian Paul <brianp@vmware.com>
Brian Paul [Tue, 3 Nov 2009 23:13:22 +0000 (16:13 -0700)]
mesa: (GLint64) casts in get.c to silence Visual Studio warnings
Revised version of a patch from Karl Schultz.
Brian Paul [Tue, 3 Nov 2009 23:12:02 +0000 (16:12 -0700)]
docs: fix 7.6 build with Visual Studio
Karl Schultz [Tue, 3 Nov 2009 23:09:26 +0000 (16:09 -0700)]
windows: updated VC8 project file
Signed-off-by: Brian Paul <brianp@vmware.com>
Karl Schultz [Tue, 3 Nov 2009 23:07:01 +0000 (16:07 -0700)]
windows: remove old entrypoints from mesa.def file
Signed-off-by: Brian Paul <brianp@vmware.com>
Karl Schultz [Tue, 3 Nov 2009 23:05:12 +0000 (16:05 -0700)]
mesa: added GLAPIENTRY keywords for sync object functions
Signed-off-by: Brian Paul <brianp@vmware.com>
Marek Olšák [Tue, 3 Nov 2009 15:16:05 +0000 (16:16 +0100)]
st/mesa: clip pixels in draw_stencil_pixels to avoid crash
Signed-off-by: Brian Paul <brianp@vmware.com>
Brian Paul [Tue, 3 Nov 2009 16:30:20 +0000 (09:30 -0700)]
st/mesa: don't use util_blit_pixels_writemask() for depth or depth/stencil
util_blit_pixels_writemask() only works for color formats at this time.
Also, it might never work for depth/stencil surfaces since we can't get
handle stencil values in a fragment shader.
Fixes glCopyTexSubImage(GL_DEPTH_COMPONENT).
Brian Paul [Tue, 3 Nov 2009 16:26:32 +0000 (09:26 -0700)]
st/mesa: fix tests for depth and depth/stencil texture formats
Vinson Lee [Mon, 2 Nov 2009 19:35:47 +0000 (12:35 -0700)]
glx: Fix memory leak if XF86DRICreateDrawable() fails
Signed-off-by: Brian Paul <brianp@vmware.com>
Chow Loong Jin [Wed, 28 Oct 2009 06:34:14 +0000 (14:34 +0800)]
Add --with-dri-searchpath argument
* Add an extra argument to configure which allows for specifying
different DRI driver search paths to libGL (FDO #24766)
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Brian Paul [Thu, 29 Oct 2009 20:46:02 +0000 (14:46 -0600)]
progs/tests: fixes for drawbuffers.c
Disable GL_DEPTH_TEST before glDrawPixels.
Show color buffer 0 on left, color buffer 1 on right.
Brian Paul [Sat, 10 Oct 2009 17:52:38 +0000 (11:52 -0600)]
progs/tests: added test for GL_EXT_texture_compression_s3tc support
Vinson Lee [Wed, 28 Oct 2009 23:59:49 +0000 (17:59 -0600)]
mesa: Fix memory leak if we run out of memory
Signed-off-by: Brian Paul <brianp@vmware.com>
Vinson Lee [Wed, 28 Oct 2009 19:09:44 +0000 (13:09 -0600)]
intel: Fix memory leak in case of renderbuffer bad format
Signed-off-by: Brian Paul <brianp@vmware.com>
Brian Paul [Wed, 28 Oct 2009 17:13:21 +0000 (11:13 -0600)]
mesa: remove unneeded #includes
Brian Paul [Wed, 28 Oct 2009 17:11:30 +0000 (11:11 -0600)]
mesa: include imports.h to silence warning
Vinson Lee [Wed, 28 Oct 2009 17:09:50 +0000 (11:09 -0600)]
intel: Fix memory leak in event of mip tree allocation failure
Signed-off-by: Brian Paul <brianp@vmware.com>
Ian Romanick [Tue, 27 Oct 2009 20:40:18 +0000 (13:40 -0700)]
ARB prog parser: Fix epic memory leak in lexer / parser interface
Anything that matched IDENTIFIER was strdup'ed and returned to the
parser. However, almost every case of IDENTIFIER in the parser just
dropped the returned string on the floor. Every swizzle string, every
option string, every use of a variable, etc. leaked memory.
Create a temporary buffer in the parser state (string_dumpster and
dumpster_size). Return strings from the lexer to the parser in the
buffer. Grow the buffer as needed. When the parser needs to keep a
string (i.e., delcaring a new variable), let it make a copy then.
The only leak that valgrind now detects is /occasionally/ the copy of
the program string in gl_program::String is leaked. I'm not seeing
how. :(
Ian Romanick [Tue, 27 Oct 2009 18:46:29 +0000 (11:46 -0700)]
ARB prog parser: Don't leak program string
The program string is kept in the program object. On the second call
into glProgramStringARB the previous kept string would be leaked.
Ian Romanick [Tue, 27 Oct 2009 18:44:56 +0000 (11:44 -0700)]
ARB prog parser: Don't leak symbol table header structures
Eric Anholt [Tue, 20 Oct 2009 21:51:53 +0000 (14:51 -0700)]
intel: Fix flipped condition in ARB_sync GetSYnciv(GL_SYNC_STATUS).
Bug #24435
(cherry picked from commit
d56125a298106d81e10674f1c4b3b43b51a5139d)
Brian Paul [Tue, 27 Oct 2009 23:34:29 +0000 (17:34 -0600)]
intel: added region draw_x/y offsets in x/y_tile_swizzle() funcs
This fixes the second part of bug 23552.
Brian Paul [Tue, 27 Oct 2009 22:46:07 +0000 (16:46 -0600)]
progs/tests: added new blitfb.c test
Tests glBlitFramebuffer() between two texture/renderbuffer surfaces.
In particular, blit from level[1] of a cube map face to a 2D texture.
Used to find/fix bug in intel do_copy_texsubimage().
See commit
aef1ab1073f3e30d699b99dae17518ed48b57c72
Brian Paul [Tue, 27 Oct 2009 22:39:01 +0000 (16:39 -0600)]
intel: fix src offset bug in do_copy_texsubimage()
Use src->draw_offset intead of zero. Zero usually worked, except when
the src renderbuffer is actually a texture mipmap level higher than zero.
Fixes progs/test/blitfb.c test.
Brian Paul [Tue, 27 Oct 2009 22:28:39 +0000 (16:28 -0600)]
glsl: fix memory leak
A slightly modified version of a patch from Vinson Lee.
Eric Anholt [Tue, 27 Oct 2009 17:26:09 +0000 (10:26 -0700)]
i915: Fix driver for the miptree x/y offset changes.
Bug #24734.
Brian Paul [Tue, 27 Oct 2009 15:31:31 +0000 (09:31 -0600)]
i965: be clear that the Fallback field is a boolean, not a bitfield
Brian Paul [Tue, 27 Oct 2009 15:27:44 +0000 (09:27 -0600)]
Revert "i965: fix hacked Fallback usage in brw_prepare_vertices()"
This reverts commit
8810b8f67135185d1044746bb861fe2ff997626c.
It turns out the i965 driver uses the intel->Fallback field as a boolean,
not as a bitmask. The intelFallback() function is a no-op in the i965
driver. It would have been nice if there were some comments about this.
I'll fix that next...
Vinson Lee [Tue, 27 Oct 2009 15:13:27 +0000 (09:13 -0600)]
draw: Fix memory leak.
This would only be hit if we got and invalid index_size.
Brian Paul [Mon, 26 Oct 2009 16:58:47 +0000 (10:58 -0600)]
docs: document Intel glBitmap fixes
Brian Paul [Mon, 26 Oct 2009 16:42:45 +0000 (10:42 -0600)]
intel: fix GL state bugs in intel_texture_bitmap()
Need to push texture state and polygon state too.
Fixes rendering glitches seen in progs/demos/engine when changing
the rendering mode (wireframe, texture modes).
This makes bitmap rendering a little slower, unfortunately.
Brian Paul [Sat, 24 Oct 2009 00:21:59 +0000 (18:21 -0600)]
mesa: remove FBO texture depth/stencil test
The texture format should not be checked until validation time since
the format might be changed by a subsequent glTexImage() call.
Brian Paul [Fri, 23 Oct 2009 22:36:15 +0000 (16:36 -0600)]
mesa: fix broken _mesa_str_checksum()
Eric Anholt [Thu, 9 Jul 2009 16:32:21 +0000 (09:32 -0700)]
intel: Keep track of x,y offsets in miptrees and use them for blitting.
By just using offsets, we confused the hardware's tiling calculations,
resulting in failures in miptree validation and blit clears.
Fixes piglit fbo-clearmipmap.
Bug #23552. (automatic mipmap generation)
Brian Paul [Fri, 23 Oct 2009 20:52:10 +0000 (14:52 -0600)]
progs/tests: print requested/internal format info
Brian Paul [Fri, 23 Oct 2009 20:49:47 +0000 (14:49 -0600)]
docs: document updated GL extension header files
Brian Paul [Fri, 23 Oct 2009 20:48:49 +0000 (14:48 -0600)]
gl: updated wglext.h to version 17
Brian Paul [Fri, 23 Oct 2009 20:48:39 +0000 (14:48 -0600)]
gl: updated glxext.h to version 25
Brian Paul [Fri, 23 Oct 2009 20:48:30 +0000 (14:48 -0600)]
gl: updated glext.h to version 56
Brian Paul [Fri, 23 Oct 2009 20:42:32 +0000 (14:42 -0600)]
docs: document cell, glGetTexLevelParameter() fixes