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
Brian Paul [Fri, 23 Oct 2009 20:40:40 +0000 (14:40 -0600)]
mesa: fix GL_TEXTURE_INTERNAL_FORMAT query for compressed formats
Need to return the actual compressed format when the user originally
requested a generic compressed format.
Brian Paul [Fri, 23 Oct 2009 20:37:41 +0000 (14:37 -0600)]
mesa: added _mesa_compressed_format_to_glenum()
Maps a compressed MESA_FORMAT_x to correspding GLenum. Needed for
querying a texture's actual format when a generic format was originally
requested.
Brian Paul [Fri, 23 Oct 2009 20:37:14 +0000 (14:37 -0600)]
mesa: change s3tc vs. fxt1 priority when choosing compressed formats
Ian Romanick [Tue, 20 Oct 2009 17:58:14 +0000 (10:58 -0700)]
ARB prog parser: Fix parameter array size comparison
Array indexes are invalid when >= the maximum, but array sizes are
only in valid when > the maximum. This prevented programs from
declaring a single maximum size array.
See the piglit vp-max-array test.
Brian Paul [Fri, 23 Oct 2009 00:32:48 +0000 (18:32 -0600)]
intel: flush old context before binding new context
Per the GLX spec, when changing rendering contexts, the old context
should first be flushed.
Brian Paul [Fri, 23 Oct 2009 00:19:01 +0000 (18:19 -0600)]
glx: don't destroy context immediately if it's currently bound
According to the GLXDestroyContext() man page, the context should not
immediately be destroyed if it's bound to some thread. Wait until it's
unbound to really delete it. The code for doing the later part is
already present in MakeContextCurrent() so no change was needed there.
Brian Paul [Fri, 23 Oct 2009 00:16:10 +0000 (18:16 -0600)]
mesa: code refactoring- new _mesa_finish(), _mesa_flush()
Brian Paul [Thu, 22 Oct 2009 23:11:59 +0000 (17:11 -0600)]
progs/xdemos: fix command line flag typo
Brian Paul [Thu, 22 Oct 2009 22:45:50 +0000 (16:45 -0600)]
i965: fix hacked Fallback usage in brw_prepare_vertices()
Setting intel->Fallback = 1 clobbered any fallback state that was already
set. Not sure where this hack originated (the git history is a little
convoluted). Define and use a new BRW_FALLBACK_DRAW bit instead. This
shouldn't break anything and could potentially fix some bugs (but no
specific ones are known).
Brian Paul [Thu, 22 Oct 2009 22:45:03 +0000 (16:45 -0600)]
intel: define INTEL_FALLBACK_DRIVER for drivers
Brian Paul [Thu, 22 Oct 2009 22:33:36 +0000 (16:33 -0600)]
intel: Fallback field is a bitmask, use GLbitfield
Brian Paul [Thu, 22 Oct 2009 22:32:08 +0000 (16:32 -0600)]
i965: remove unused brw_context::tmp_fallback field
Brian Paul [Thu, 22 Oct 2009 22:26:54 +0000 (16:26 -0600)]
i965: remove unused BRW_FALLBACK_TEXTURE bit
The value was probably wrong too.
It was the same as INTEL_FALLBACK_DRAW_BUFFER.
Andre Maasikas [Wed, 21 Oct 2009 16:04:21 +0000 (19:04 +0300)]
r600: set barrier for tex inst if dst is used earlier, might overwrite it otherwise
Andre Maasikas [Wed, 21 Oct 2009 09:23:27 +0000 (12:23 +0300)]
r600: need to export something from PS
Also avoids empty shader for "END" - seems to be somewhat valid fp
Maybe this can be done differently in the future (fake FRAG_RESULT_COLOR
already in Map_Fragment_Program() or is there a way to program the chip
to not hang in case of no exports.
Andre Maasikas [Tue, 20 Oct 2009 08:45:39 +0000 (11:45 +0300)]
r600: add beginnings of ARL instruction
Brian Paul [Tue, 20 Oct 2009 22:22:03 +0000 (16:22 -0600)]
progs/trivial: check if GL_ARB_occlusion_query is supported
Marc Dietrich [Sun, 18 Oct 2009 15:28:34 +0000 (08:28 -0700)]
cell: fix compilation on cell
s/LERP/LRP/
Vinson Lee [Tue, 20 Oct 2009 16:43:46 +0000 (10:43 -0600)]
mesa: Fix Mac OS build.
strtod_l needs the xlocale.h header on Mac OS. It's possible other
non-Linux OSes would need this header too.
Mathias Fröhlich [Mon, 19 Oct 2009 15:47:21 +0000 (11:47 -0400)]
r300: fix texture size handling with size > 2048
The in kernel texture check fails because of both
bit11 flags being set on 16x16 textures. It tuns out
that these bits are still set and not cleared in the
pp_txpitch field of the texture. The attached patch
at least helps for this case on my machine. It clears
the bit 11 from the pitch field if the texture is smaller
and masks out that hight bits on the conventional width
and height field.
Fixes bug 24584
Robert Noland [Mon, 19 Oct 2009 14:47:39 +0000 (09:47 -0500)]
r600: Fix size calculation for 24 bit depth
size was being calculated based on 3 bytes per pixel with 24 bit depth
instead of 4 bytes. This caused corruption in the bottom 25% of objects.
This finishes fixing the menu/text corruption in compiz/kde4.
Signed-off-by: Robert Noland <rnoland@2hip.net>
Maciej Cencora [Fri, 16 Oct 2009 18:21:17 +0000 (20:21 +0200)]
r300: fix vertex program parameters limits
Brian Paul [Fri, 16 Oct 2009 13:38:39 +0000 (07:38 -0600)]
docs: document GLSL float parsing bug fix
Brian Paul [Wed, 14 Oct 2009 20:19:03 +0000 (14:19 -0600)]
mesa: use C locale for _mesa_strtod()
_mesa_strtod() is used for shader/program parsing where the decimal
point character is always '.' Use strtod_l() with a "C" locale to
ensure correct string->double conversion when the actual locale uses
another character such as ',' for the decimal point.
Fixes bug 24531.
Owen Taylor [Wed, 14 Oct 2009 20:20:07 +0000 (16:20 -0400)]
Use the right pitch when rendering to a texture
We need to get the pitch from the texture level we are rendering to,
rather than just using the base texel width.
Robert Noland [Wed, 14 Oct 2009 19:04:24 +0000 (14:04 -0500)]
r600: FRAG_ATTRIB_WPOS and FRAG_ATTRIB_FOGC appear to be supported.
Report unsupported attributes while I'm here.
Signed-off-by: Robert Noland <rnoland@2hip.net>
Robert Noland [Wed, 14 Oct 2009 19:02:12 +0000 (14:02 -0500)]
r600: cleanup in r600_cs_process_relocs().
Signed-off-by: Robert Noland <rnoland@2hip.net>
Robert Noland [Wed, 14 Oct 2009 18:58:56 +0000 (13:58 -0500)]
radeon: return EINVAL for 0 length buffers.
Signed-off-by: Robert Noland <rnoland@2hip.net>
Andre Maasikas [Thu, 15 Oct 2009 15:24:49 +0000 (11:24 -0400)]
r600: fix tfp1 bo size
Setting the wrong bo size resulting in an incomplete
read cache flush when reading the texture. This fixes the
compiz text corruption.
[agd5f: take hw pitch alignment into account]
Andre Maasikas [Mon, 12 Oct 2009 11:57:45 +0000 (14:57 +0300)]
r600: implement ProgramStringNotify
need this to properly test with piglit/glean vert/fragprog tests
copied mostly from r300, many thanks to osiris, nha, airlied, others...
Andre Maasikas [Mon, 12 Oct 2009 09:58:40 +0000 (12:58 +0300)]
r600: LIT dst.y gets value from src.x
seems I overlooked this when removing hardcoded swizzles for this
one previously
Andre Maasikas [Mon, 12 Oct 2009 09:20:26 +0000 (12:20 +0300)]
r600: DPH adds w comp of second operand, so set first one to 1 instead
Andre Maasikas [Fri, 9 Oct 2009 07:46:12 +0000 (10:46 +0300)]
r600: fixup KIL instruction a bit
- KILLGT takes 2 arguments
- arb KIL has no dst register
- add TODO about clause ending but currently piglit fp-kil passes and
does not hang the card
Andre Maasikas [Mon, 28 Sep 2009 08:23:49 +0000 (11:23 +0300)]
r600: use CB_TARGET_MASK instead of CB_SHADER_MASK for setting color mask
makes blend functions work better
Signed-off-by: Dave Airlie <airlied@linux.ie>