OSDN Git Service
Brian Paul [Wed, 26 Aug 2009 17:55:15 +0000 (11:55 -0600)]
progs/glsl: add special Makefile rule for samplers_array
Brian Paul [Wed, 26 Aug 2009 17:53:25 +0000 (11:53 -0600)]
progs/glsl: change samplers.c to better test sampler/texture indexing
Now the left half is yellow and the right half is red, with the gradients
going in opposite directions.
Brian Paul [Wed, 26 Aug 2009 17:39:24 +0000 (11:39 -0600)]
glsl: fix bug in sampler array indexing
Need to add the 'offset' parameter when indexing the parameter array.
Before, if we were setting arrays of samplers, we were actually only
setting the 0th sampler's value.
Because of how progs/glsl/samplers.c is constructed, this wasn't showing
up as a failure in the samplers_array output.
Brian Paul [Mon, 24 Aug 2009 19:56:01 +0000 (13:56 -0600)]
ARB prog: Set error instead of falling through with incorrect value
If a fragment program only parameter was queried of a vertex program
(e.g., GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB) no error would be set and
a random value would be returned. This caused 'glxinfo -l' to show
the same values for GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB,
GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB, GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB,
GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB,
GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB,
GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB as for
GL_MAX_PROGRAM_ENV_PARAMETERS_ARB. This is confusing and incorrect.
(cherry picked from master, commit
4bccd693a72a0b42dffc849034263a68e779ca91)
Brian Paul [Mon, 24 Aug 2009 19:02:33 +0000 (13:02 -0600)]
docs: recent 7.5.1 bug fixes
Brian Paul [Mon, 24 Aug 2009 18:58:47 +0000 (12:58 -0600)]
xlib: fix single buffer window resize bug
When a single-buffered window was resized the new window size was never
detected. This fix that, but there's still a bug which causes window
contents corruption for certain window sizes...
Brian Paul [Mon, 24 Aug 2009 18:43:57 +0000 (12:43 -0600)]
vbo: fix divide by zero exception
Fixes bug 23489.
Vinson Lee [Mon, 24 Aug 2009 17:43:02 +0000 (11:43 -0600)]
glsl: Silence gcc uninitialized variable warning.
Brian Paul [Fri, 21 Aug 2009 16:24:50 +0000 (10:24 -0600)]
st/mesa: flush bitmap cache if Z value changes
When adding a new bitmap to the cache we have to check if the Z value is
changing and flush first if it is.
This is a modified version of a patch from Justin Dou <justin.dou@intel.com>
Brian Paul [Thu, 20 Aug 2009 16:34:45 +0000 (10:34 -0600)]
tgsi: check for SOA dependencies in SSE and PPC code generators
Fall back to interpreter for now. This doesn't happen very often.
Brian Paul [Thu, 20 Aug 2009 16:28:22 +0000 (10:28 -0600)]
tgsi: handle SOA dependencies for MOV/SWZ
SOA dependencies can happen when a register is used both as a source and
destination and the source is swizzled. For example:
MOV T, T.yxwz; would expand into:
MOV t0, t1;
MOV t1, t0;
MOV t2, t3;
MOV t3, t2;
The second instruction will produce the wrong result since we wrote to t0
in the first instruction. We need to use an intermediate temporary to fix
this.
This will take more work to fix for all TGSI instructions. This seems to
happen with MOV instructions more than anything else so fix that case now
and warn on others.
Fixes piglit glsl-vs-loop test (when not using SSE). See bug 23317.
Brian Paul [Thu, 20 Aug 2009 16:25:42 +0000 (10:25 -0600)]
tgsi: added tgsi_full_instruction::Flags field
Users of the parser can make use of this.
Brian Paul [Tue, 18 Aug 2009 23:50:43 +0000 (17:50 -0600)]
tgsi/ppc: we don't implement saturation modes yet
Brian Paul [Tue, 18 Aug 2009 23:49:57 +0000 (17:49 -0600)]
tgsi/sse: we don't implement saturation modes yet
Fixes piglit fp-generic tests/shaders/generic/lrp_sat.fp, bug 23316.
Brian Paul [Tue, 18 Aug 2009 23:39:55 +0000 (17:39 -0600)]
mesa: when emitting vertex program fog, set yzw=0,0,1
Fixes piglit fp-fog failure with gallium.
Brian Paul [Fri, 14 Aug 2009 20:15:18 +0000 (14:15 -0600)]
progs/demos: print more info in fbotexture.c
José Fonseca [Fri, 14 Aug 2009 19:05:33 +0000 (20:05 +0100)]
gallium: Always map for READ flag when DISCARD is not set.
This prevents the driver from discarding a buffer when the whole buffer
is mapped for writing, but only a portion is effectively written.
This is a temporary fix, because WRITE shouldn't imply DISCARD.
The full fix implies using PIPE_BUFFER_USAGE_DISCARD, throughout
the code, and will go only into master.
José Fonseca [Fri, 14 Aug 2009 17:47:56 +0000 (18:47 +0100)]
trace: Remove space next to the class attribute of the trace.
José Fonseca [Sun, 31 May 2009 19:53:22 +0000 (12:53 -0700)]
python/retrace: Open bz2 files correctly.
Brian Paul [Fri, 14 Aug 2009 17:24:20 +0000 (11:24 -0600)]
docs: docs: document new --with-max-width/height config options
Brian Paul [Fri, 14 Aug 2009 17:23:18 +0000 (11:23 -0600)]
Add a FAQ about internal buffer sizes.
(cherry picked from master, commit
9a8781bd24730374e14568f67f7db8a9cc444bb4)
Brian Paul [Fri, 14 Aug 2009 17:23:00 +0000 (11:23 -0600)]
Add configure options for MAX_WIDTH/HEIGHT.
This adds two --with configure options for setting defines for
MAX_WIDTH and MAX_HEIGHT. It's conceivably just as easy to define
these in CFLAGS manually, but this way users don't need to know
about internal Mesa details.
Patch updated by BrianP to set DEFINES, not CFLAGS.
(cherry picked from master, commit
7085dce750f478312a47f474330d63cc900a8448)
Brian Paul [Fri, 14 Aug 2009 17:22:37 +0000 (11:22 -0600)]
Allow external settings of MAX_WIDTH/HEIGHT.
Conditionalize MAX_WIDTH / MAX_HEIGHT defines so that users can
set them via CFLAGS.
(cherry picked from master, commit
66bc17e80e22d8f205cc02171b1c266feab6631f)
Brian Paul [Fri, 14 Aug 2009 16:30:10 +0000 (10:30 -0600)]
mesa: move assertions in test_attachment_completeness()
Put the assertions after the error checks.
Brian Paul [Thu, 13 Aug 2009 20:38:27 +0000 (14:38 -0600)]
mesa: fix some invalid memory reads
We were passing the address of a float to functions that would deref the
pointer as an array.
Brian Paul [Thu, 13 Aug 2009 20:07:25 +0000 (14:07 -0600)]
progs/tests: hack a PBO/dlist test
Brian Paul [Thu, 13 Aug 2009 20:05:52 +0000 (14:05 -0600)]
mesa: fix warnings about locals hiding function params
Brian Paul [Thu, 13 Aug 2009 20:00:21 +0000 (14:00 -0600)]
mesa: add missing PBO mapping code in unpack_image()
Brian Paul [Thu, 13 Aug 2009 19:48:36 +0000 (13:48 -0600)]
main: fix some potential memory leaks
Allocate dlist images after error checking.
Record GL_OUT_OF_MEMORY when we can't make a copy of an image.
Brian Paul [Thu, 13 Aug 2009 19:44:31 +0000 (13:44 -0600)]
mesa: fix some potential uninitialized memory references
Brian Paul [Thu, 13 Aug 2009 19:44:01 +0000 (13:44 -0600)]
glsl: fix some uninitialized pointers
Keith Whitwell [Thu, 13 Aug 2009 14:54:10 +0000 (15:54 +0100)]
draw: cope with more primitives in draw_pipeline_run
This previously was used only for decomposed (POINT/LINE/TRI) primitives,
but for some time a full range of primitives could end up in here.
Fixes trivial/lineloop-clip on softpipe, among others.
(cherry picked from commit
87cd8a3b8a2407b30916be418ff2f95dfea5d2ad)
Pauli Nieminen [Fri, 7 Aug 2009 17:02:22 +0000 (10:02 -0700)]
dri: Fix problems with unitialized values in dri screen object.
This fixes crash in r200 KMS driver when pSAREA was set to 1 randomly because of memory wasn't cleared.
Signed-off-by: Pauli Nieminen <suokkos@gmail.com>
Brian Paul [Thu, 6 Aug 2009 20:58:01 +0000 (14:58 -0600)]
util: fix incorrect assertion
Check that the dest surface/format is renderable.
Brian Paul [Thu, 6 Aug 2009 20:54:25 +0000 (14:54 -0600)]
util: include u_surface.h, added comment
Brian Paul [Thu, 6 Aug 2009 15:02:36 +0000 (09:02 -0600)]
util: use util_same_surface() to compare surface pointers
Brian Paul [Thu, 6 Aug 2009 15:02:05 +0000 (09:02 -0600)]
util: added util_same_surface() helper function
Alan Hourihane [Thu, 6 Aug 2009 14:54:49 +0000 (15:54 +0100)]
Ensure GL_EXT_blend_equation_separate is enabled when 2.0 is enabled.
Brian Paul [Wed, 5 Aug 2009 19:50:21 +0000 (13:50 -0600)]
docs:fix glBlitFramebuffer() for Gallium
Brian Paul [Wed, 5 Aug 2009 19:46:47 +0000 (13:46 -0600)]
st/mesa: implement BlitFramebuffer() for depth/stencil (incomplete)
We now handle the case of blitting Z+stencil to/from combined Z/stencil
surfaces. But Z-only or stencil-only and separate depth/stencil surfaces
are not yet implemented.
Brian Paul [Wed, 5 Aug 2009 19:44:59 +0000 (13:44 -0600)]
mesa: generate GL_INVALID_OPERATION for missing z/stencil when blitting
If glBlitFramebuffer() is called with GL_DEPTH_BUFFER_BIT or
GL_STENCIL_BUFFER_BIT and the src/dst depth/stencil buffers are absent,
report an error.
Brian Paul [Wed, 5 Aug 2009 19:26:19 +0000 (13:26 -0600)]
st/mesa: fix Y inversion and optimize st_BlitFramebuffer()
Need to check for Y inversion separately for src/dest buffers.
If both the src and dest regions are upside down, make them right-side
up for a better chance at a fast path.
progs/tests/copypixrate -blit is much faster now.
Brian Paul [Wed, 5 Aug 2009 19:22:26 +0000 (13:22 -0600)]
util: added comment/question about blit clipping
Brian Paul [Wed, 5 Aug 2009 19:21:59 +0000 (13:21 -0600)]
mesa: make _mesa_clip_blit() a shared function
Brian Paul [Wed, 5 Aug 2009 19:19:01 +0000 (13:19 -0600)]
util: added util_blit_pixels() overlap test
A comment alluded to this. Now it's checked.
Brian Paul [Wed, 5 Aug 2009 19:09:15 +0000 (13:09 -0600)]
util: fix util_blit_pixels() test for surface_copy() path
For the surface_copy() path require same format, no flipping and no stretching.
Fixes progs/tests/copypixrate -blit
Brian Paul [Wed, 5 Aug 2009 18:40:50 +0000 (12:40 -0600)]
util: reformatting and comments
Brian Paul [Tue, 4 Aug 2009 15:27:49 +0000 (09:27 -0600)]
docs: 7.5.1 bug fixes
Brian Paul [Tue, 4 Aug 2009 15:23:17 +0000 (09:23 -0600)]
intel: Fix inverted test for disabling flushing of front buffer output.
The comment disagreed with the code, and nicely drew my eyes to what was
going wrong.
Bug #21774 (blender)
Bug #21788 (readpix)
(cherry picked from master, commit
fd65418f600874b05f902b622078b40bc1abb24a)
Brian Paul [Tue, 4 Aug 2009 15:22:15 +0000 (09:22 -0600)]
intel: Wait on the last swapbuffers to complete before queuing a new one.
This fixes jerkiness in doom3 and other apps since the kernel change to
throttle less absurdly, which led to a thundering herd of frames.
Because this is a rather minimal fix, there is at least one downside: If
the whole scene completes in one batchbuffer, we'll end up stalling the GPU.
Thanks to Michel Dänzer for suggesting using glFlush to signal frame end
instead of going to all the effort of adding a new DRI2 extension.
(cherry picked from master, commit
0828579a658af01a64b5e699175dc9bbbedcd685)
Brian Paul [Tue, 4 Aug 2009 15:15:33 +0000 (09:15 -0600)]
texenv: Use VP->Current, since _Current isn't updated at this point.
(cherry picked from master, commit
a9ba1bfeb3a2852c6eda718e73c46c972a286648)
Brian Paul [Tue, 4 Aug 2009 15:15:09 +0000 (09:15 -0600)]
texenv: Match state.c in deciding whether we'll be using a vertex shader.
(cherry picked from master, commit
40990d9dfb20b69585859b2a45596aa46c20140a)
Brian Paul [Tue, 4 Aug 2009 15:14:33 +0000 (09:14 -0600)]
texenv: Add missing dependency on VP changes.
Funny thing is I annotated this dependency in
e5f63c403b767f9974e8eb5d412c012b8a69287f, but didn't actually use it.
(cherry picked from master, commit
03187571b63d97e3d1406d329c5e760e16ef3181)
Conflicts:
src/mesa/main/state.c
Dan Nicholson [Mon, 3 Aug 2009 15:35:43 +0000 (08:35 -0700)]
mklib: Ensure target directory exists for library
Instead of relying on the Makefile to always generate $(TOP)/$(LIB_DIR),
just have mklib handle creating the directory. This should fix any races
when using parallel make.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
(cherry picked from commit
23671e5358ffc0abfec83aeea9a515b09a6b35f3)
Peter Hutterer [Mon, 20 Jul 2009 06:11:26 +0000 (16:11 +1000)]
Add missing X11_INCLUDES to egl/drivers/demo and egl/main.
Compiling mesa on a system with no X headers installed in the default
include paths fails due to missing X11 includes. The header includes are
picked up by configure but not applied.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
(cherry picked from commit
5358e54d1ae64ccfa81199b343a2931b415fcc0a)
Pauli Nieminen [Mon, 3 Aug 2009 19:05:33 +0000 (12:05 -0700)]
xdemo/glxswapcontrol: Move get_framge_usage after the swap.
This fixes the problem that first frame would report bogus usage values.
Problem was caused because get_frame_usage returned data from previous buffer
swap.
Signed-off-by: Pauli Nieminen <suokkos@gmail.com>
Pauli Nieminen [Mon, 3 Aug 2009 17:43:38 +0000 (10:43 -0700)]
xdemos/glxcontexts: Don't leak visual info when choosing visual again.
Signed-off-by: Pauli Nieminen <suokkos@gmail.com>
Brian Paul [Mon, 3 Aug 2009 17:16:23 +0000 (11:16 -0600)]
st/mesa: we don't support GL_NV_point_sprite (see comment)
Brian Paul [Thu, 30 Jul 2009 15:02:27 +0000 (09:02 -0600)]
mesa: move misplaced return statement
Fixes regression from commit
7d93f817c9c5222e2bdbaa9fa9f03fc502bfe878
Brian Paul [Thu, 30 Jul 2009 14:20:01 +0000 (08:20 -0600)]
mesa: add missing return after catching program error
Keith Whitwell [Wed, 29 Jul 2009 11:47:23 +0000 (12:47 +0100)]
mesa/st: short-circuit glFinish calls on WIN32 only
Windows opengl32.dll calls glFinish prior to every swapbuffers, which
makes it pretty hard to get decent performance...
Work around by mapping finish to flush on PIPE_OS_WINDOWS. This is
conformant, though it might confuse poorly-written benchmarks which
attempt to measure a single event rather than figuring out the rate of
continuous processing.
Keith Whitwell [Tue, 28 Jul 2009 17:45:22 +0000 (18:45 +0100)]
mesa/st: recognize no-op scissor state when checking clear_with_quads
Some apps enable scissor but set the rectangle to the dimensions of
the window. Don't let this force us onto a slower clear path.
Keith Whitwell [Thu, 16 Jul 2009 16:51:02 +0000 (17:51 +0100)]
util: _debug_printf should print even when DEBUG is not defined
The leading underscore is meaningful... This function is used by
_warning and _error functions as well as the more common
debug_printf().
debug_printf (without underscore) gets turned off when DEBUG is
disabled, but warning/error messages still use this function to get
their message out.
(cherry picked from commit
0ac879dca797360570543d5bd0fd64f8fb8e566e)
RALOVICH, Kristóf [Thu, 23 Jul 2009 15:05:59 +0000 (17:05 +0200)]
glx: assign per screen driver configs (DRISW)
RALOVICH, Kristóf [Thu, 23 Jul 2009 15:05:50 +0000 (17:05 +0200)]
glx: assign per screen driver configs (DRI)
RALOVICH, Kristóf [Thu, 23 Jul 2009 15:05:43 +0000 (17:05 +0200)]
glx: assign per screen driver configs (DRI2)
RALOVICH, Kristóf [Thu, 23 Jul 2009 15:04:52 +0000 (17:04 +0200)]
glx: properly release DRI configs
Release per screen DRI driver configs during screen destruction.
RALOVICH, Kristóf [Thu, 23 Jul 2009 15:03:54 +0000 (17:03 +0200)]
glx: cache DRI configs in __GLXscreenConfigsRec
Vinson Lee [Tue, 28 Jul 2009 14:54:14 +0000 (08:54 -0600)]
progs/trivial: add missing files to Makefile, .gitignore
Brian Paul [Mon, 27 Jul 2009 21:32:50 +0000 (15:32 -0600)]
intel: Fix leak of DRI option info due to using the wrong free routine.
(cherry picked from commit
6d66f23c50ebe8f973757b6fd1b81c9b7920c447)
Brian Paul [Mon, 27 Jul 2009 21:28:49 +0000 (15:28 -0600)]
intel: Clean up leak of driver context structure on context destroy.
(cherry picked from commit
ddef7dc87b2001fbe117ee5f24a0c645ee95a03c)
Brian Paul [Mon, 27 Jul 2009 21:10:28 +0000 (15:10 -0600)]
st/mesa: silence warning
Brian Paul [Mon, 27 Jul 2009 21:09:56 +0000 (15:09 -0600)]
mesa: separate some finite/pragma Watcom stuff
Brian Paul [Mon, 27 Jul 2009 21:08:44 +0000 (15:08 -0600)]
softpipe: include sp_winsys.h to silence function prototype warning
Brian Paul [Mon, 27 Jul 2009 20:35:18 +0000 (14:35 -0600)]
intel: Use _mesa_warning() to report GEM warnings
Karl Schultz [Mon, 27 Jul 2009 19:38:35 +0000 (13:38 -0600)]
windows: updated VC8 project files
See bug 22882.
Brian Paul [Fri, 17 Jul 2009 22:58:27 +0000 (16:58 -0600)]
docs: 7.5 tarball md5sums
José Fonseca [Sun, 26 Jul 2009 19:31:11 +0000 (20:31 +0100)]
util: fix typo.
Brian Paul [Fri, 24 Jul 2009 02:20:39 +0000 (20:20 -0600)]
mesa: include glew headers in MesaDemos tarballs
Brian Paul [Wed, 22 Jul 2009 18:49:34 +0000 (12:49 -0600)]
docs: initial release notes for 7.5.1
Brian Paul [Wed, 22 Jul 2009 18:46:53 +0000 (12:46 -0600)]
mesa: bump version to 7.5.1
Brian Paul [Wed, 22 Jul 2009 18:34:07 +0000 (12:34 -0600)]
mesa: include GLEW sources in MesaDemos tarball
Eric Anholt [Fri, 3 Jul 2009 02:21:22 +0000 (19:21 -0700)]
intel: Fall back on glBitmap with fog enabled.
We would have to build the program with the appropriate fog mode, and
also supply the fog coordinate if appropriate.
Bug #19413.
(cherry picked from commit
8ae02a3919bf31bd33f86208472e100eedb58497)
Eric Anholt [Tue, 21 Jul 2009 00:58:12 +0000 (17:58 -0700)]
i965: Don't clip everything if FRONT_AND_BACK culling while culling disabled.
Fixes everything-black with meta_clear_tris on quake4-mpdemo and doom3-demo.
Bug #18844, 22077.
(cherry picked from commit
81d555068408d4343d7627c8bedda5675f09bd21)
Michel Dänzer [Mon, 20 Jul 2009 18:26:28 +0000 (20:26 +0200)]
radeon: With DRI1, if we have HW stencil, only expose fbconfigs with stencil.
Otherwise simple apps like glxgears pick up a DirectColor visual since the X
server mixes the depth 32 visual in with the other GLX visuals, and this seems
to result in a (mostly) black screen due to a bad ColorMap for a lot of people.
The bad ColorMap may be a bug in the apps, the X server or X driver, and
regardless of that I think the X server should ideally make the depth 32 GLX
visual separate from the rest again, but in the meantime this makes us cope.
(depth_bits is either 16 or 24, never 0)
Brian Paul [Fri, 17 Jul 2009 20:43:29 +0000 (14:43 -0600)]
progs/util: remove extfuncs.h (we use GLEW instead)
Brian Paul [Fri, 17 Jul 2009 19:23:11 +0000 (13:23 -0600)]
progs/glsl: finish conversion to GLEW
This is a follow-on to
b799af91d5ffbee1481161fec29eb4c92b161272.
Remove _func function suffix and unneeded #includes.
Brian Paul [Fri, 17 Jul 2009 18:40:48 +0000 (12:40 -0600)]
mesa: set version to 7.5
Brian Paul [Fri, 17 Jul 2009 18:40:44 +0000 (12:40 -0600)]
mesa: set version to 7.5
Brian Paul [Fri, 17 Jul 2009 18:40:24 +0000 (12:40 -0600)]
docs: set date for 7.5 release
Brian Paul [Fri, 17 Jul 2009 15:40:45 +0000 (09:40 -0600)]
docs: news entry for 7.5 release
Brian Paul [Fri, 17 Jul 2009 15:40:28 +0000 (09:40 -0600)]
docs: update links to Gallium wiki page on freedesktop.org
José Fonseca [Thu, 16 Jul 2009 18:34:44 +0000 (19:34 +0100)]
python/retrace: Process the call no passed to --to option inclusively.
José Fonseca [Thu, 16 Jul 2009 18:32:40 +0000 (19:32 +0100)]
python/retrace: Dump the surface copy contents.
José Fonseca [Thu, 16 Jul 2009 18:31:36 +0000 (19:31 +0100)]
python/retrace: Flush stdout before calling the pipe driver.
So that messages are in sync with stderr.
José Fonseca [Thu, 16 Jul 2009 18:20:25 +0000 (19:20 +0100)]
mesa: Fix logbase2.
It was providing 1 too many for non power two values.
José Fonseca [Thu, 16 Jul 2009 10:21:12 +0000 (11:21 +0100)]
python: Hack to prevent segmentation faults when python exits.
José Fonseca [Thu, 16 Jul 2009 10:20:12 +0000 (11:20 +0100)]
wgl: Expose pipe_screen/pipe_context via an extension.
José Fonseca [Thu, 16 Jul 2009 10:19:06 +0000 (11:19 +0100)]
python: Obtain pipe_screen/pipe_context from the system's OpenGL driver.
Luca Barbieri [Wed, 15 Jul 2009 17:34:36 +0000 (11:34 -0600)]
softpipe: limit blend results to [0,1]