OSDN Git Service

android-x86/external-mesa.git
14 years agoi965: Calculate enabled[] and nr_enabled once and re-use the values.
Eric Anholt [Mon, 3 Aug 2009 21:46:18 +0000 (14:46 -0700)]
i965: Calculate enabled[] and nr_enabled once and re-use the values.

The code duplication bothered me.
(cherry picked from commit 9b9cb30d128fc5f1ba77287696ecd508e640efde)

14 years agoi965: Set the max index buffer address correctly according to the docs.
Eric Anholt [Wed, 24 Jun 2009 02:30:25 +0000 (19:30 -0700)]
i965: Set the max index buffer address correctly according to the docs.

It's the last addressable byte, not the byte after the end of the buffer.
(cherry picked from commit b72dea5441e8e9226dabf1826fa3bc129c7bc281)

14 years agoi965: rename var: s/tmp/vs_inputs/
Brian Paul [Fri, 15 May 2009 15:14:24 +0000 (09:14 -0600)]
i965: rename var: s/tmp/vs_inputs/
(cherry picked from commit 840c09fc71542fdfc71edd2a2802925d467567bb)

14 years agodocs: 7.5.1 md5 sums
Brian Paul [Thu, 3 Sep 2009 21:49:10 +0000 (15:49 -0600)]
docs: 7.5.1 md5 sums

14 years agodocs: point to fd.o for downloads instead of SourceForge
Brian Paul [Thu, 3 Sep 2009 21:44:49 +0000 (15:44 -0600)]
docs: point to fd.o for downloads instead of SourceForge

14 years agogallium/xlib: silence unitialized var warning
Brian Paul [Thu, 3 Sep 2009 21:44:22 +0000 (15:44 -0600)]
gallium/xlib: silence unitialized var warning

14 years agogallium/xlib: silence uninitialized var warning
Brian Paul [Thu, 3 Sep 2009 21:23:15 +0000 (15:23 -0600)]
gallium/xlib: silence uninitialized var warning

14 years agost/mesa: silence uninitialized var warnings
Brian Paul [Thu, 3 Sep 2009 21:04:49 +0000 (15:04 -0600)]
st/mesa: silence uninitialized var warnings

14 years agodocs: prep for 7.5.1 release
Brian Paul [Thu, 3 Sep 2009 20:57:30 +0000 (14:57 -0600)]
docs: prep for 7.5.1 release

14 years agodocs: added news entry for 7.5.1
Brian Paul [Thu, 3 Sep 2009 20:57:16 +0000 (14:57 -0600)]
docs: added news entry for 7.5.1

14 years agodocs: update precompiled libs info
Brian Paul [Thu, 3 Sep 2009 20:57:04 +0000 (14:57 -0600)]
docs: update precompiled libs info

14 years agodocs: move SGI GLU link
Brian Paul [Thu, 3 Sep 2009 20:56:50 +0000 (14:56 -0600)]
docs: move SGI GLU link

14 years agost/mesa: fix glCopyPixels(GL_STENCIL_INDEX) inverted position
Brian Paul [Thu, 3 Sep 2009 20:39:53 +0000 (14:39 -0600)]
st/mesa: fix glCopyPixels(GL_STENCIL_INDEX) inverted position

If the renderbuffer orientation is Y=0=TOP we need to invert the dstY
position.

14 years agost/mesa: Do GL_RGBA->GL_RGB texsubimage on hardware
Keith Whitwell [Wed, 2 Sep 2009 17:30:11 +0000 (18:30 +0100)]
st/mesa: Do GL_RGBA->GL_RGB texsubimage on hardware

State tracker currently backs GL_RGB textures with RGBA almost always.
This means we need to maintain A==1 in these textures to give correct GL_RGB
sampling results.

This change offloads the RGBA->RGB copy to hardware using the new writemask
version of u_blit_pixels.

More src/dstLogical/dstActual triples could be shifted to hardware by
this technique in future patches.

14 years agoutil: add version of u_blit_pixels which takes a writemask
Keith Whitwell [Wed, 2 Sep 2009 16:58:52 +0000 (17:58 +0100)]
util: add version of u_blit_pixels which takes a writemask

Values outside the writemask are set in the destination to {0,0,0,1}

14 years agodraw: remove unused variable
Keith Whitwell [Tue, 1 Sep 2009 10:11:28 +0000 (11:11 +0100)]
draw: remove unused variable

14 years agoprogs/tests: re-enable exit() call
Brian Paul [Tue, 1 Sep 2009 14:53:31 +0000 (08:53 -0600)]
progs/tests: re-enable exit() call

See bug 21267.

14 years agoswrast: fix selection/feedback regression
Brian Paul [Mon, 31 Aug 2009 23:54:46 +0000 (17:54 -0600)]
swrast: fix selection/feedback regression

This fixes a conform selection/feedback regression introduced by commit
8f4d66c5f893b49eb3973aa3b31a856314c045c7

14 years agoswrast: can't use deferred texture/shading if using KIL instruction
Brian Paul [Mon, 31 Aug 2009 19:28:31 +0000 (13:28 -0600)]
swrast: can't use deferred texture/shading if using KIL instruction

If the fragment program uses KIL, we have to execute it before z/stencil
testing.  Otherwise, deferred texture/shading lets us skip shading for
pixels that fail z/stencil testing.

14 years agomesa: added const qualifiers, move local var
Brian Paul [Mon, 31 Aug 2009 17:17:59 +0000 (11:17 -0600)]
mesa: added const qualifiers, move local var

14 years agomesa: fix saturation logic in emit_texenv()
Brian Paul [Mon, 31 Aug 2009 17:14:16 +0000 (11:14 -0600)]
mesa: fix saturation logic in emit_texenv()

We need to clamp/saturate after each texenv stage, not just the last one.
Fixes glean texEnv failure for softpipe (and probably other fragment program-
based drivers).

14 years agodocs: fixed glXCreateGLXPixmap() for direct rendering
Brian Paul [Mon, 31 Aug 2009 16:32:56 +0000 (10:32 -0600)]
docs: fixed glXCreateGLXPixmap() for direct rendering

14 years agodocs/: document cross-compile fix
Brian Paul [Mon, 31 Aug 2009 16:31:45 +0000 (10:31 -0600)]
docs/: document cross-compile fix

14 years agomesa: fix 32bit cross compilation on a 64bit machine
Marc Dietrich [Mon, 31 Aug 2009 15:56:33 +0000 (08:56 -0700)]
mesa: fix 32bit cross compilation on a 64bit machine

When cross compiling on a 64bit machine, gen_matypes.c is build
for the host machine (64bit) but must generates code for the target
machine (32bit). This causes wrong offsets all over the place and
crashes googleearth on my machine. Solution is to add -m32 when
cross compiling.

Attached patch is compatible with linux-x86-32 and autoconf based
builds.

14 years agoglx/x11: Fix glXCreateGLXPixmap for direct rendering.
Michel Dänzer [Sun, 30 Aug 2009 10:43:37 +0000 (12:43 +0200)]
glx/x11: Fix glXCreateGLXPixmap for direct rendering.

Fixes progs/xdemos/glxpixmap modified to use direct rendering.

14 years agoutil: Reset size to zero when failed to allocate buffer.
José Fonseca [Fri, 28 Aug 2009 11:52:16 +0000 (12:52 +0100)]
util: Reset size to zero when failed to allocate buffer.

14 years agodocs: fix selection/feedback culling bug
Brian Paul [Thu, 27 Aug 2009 22:50:44 +0000 (16:50 -0600)]
docs: fix selection/feedback culling bug

14 years agoswrast: fix incorrect tri culling in selection/feedback mode.
Brian Paul [Thu, 27 Aug 2009 22:50:03 +0000 (16:50 -0600)]
swrast: fix incorrect tri culling in selection/feedback mode.

See bug 16866.

14 years agomesa: direct program debug output to stderr instead of stdout
marvin24 [Thu, 27 Aug 2009 15:22:51 +0000 (09:22 -0600)]
mesa: direct program debug output to stderr instead of stdout

14 years agogallium/util: added support for SRGB formats
Brian Paul [Thu, 27 Aug 2009 15:10:34 +0000 (09:10 -0600)]
gallium/util: added support for SRGB formats

Fixes glean/texture_srgb failure, bug #23449.

14 years agogallium/util: added cases for SRGB formats
Brian Paul [Thu, 27 Aug 2009 15:09:56 +0000 (09:09 -0600)]
gallium/util: added cases for SRGB formats

14 years agoglsl: signal that the program needs to be re-translated when samplers change
Brian Paul [Wed, 26 Aug 2009 20:29:50 +0000 (14:29 -0600)]
glsl: signal that the program needs to be re-translated when samplers change

14 years agodocs: document sampler array bug fix
Brian Paul [Wed, 26 Aug 2009 18:04:35 +0000 (12:04 -0600)]
docs: document sampler array bug fix

14 years agoprogs/glsl: add special Makefile rule for samplers_array
Brian Paul [Wed, 26 Aug 2009 17:55:15 +0000 (11:55 -0600)]
progs/glsl: add special Makefile rule for samplers_array

14 years agoprogs/glsl: change samplers.c to better test sampler/texture indexing
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.

14 years agoglsl: fix bug in sampler array indexing
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.

14 years agoARB prog: Set error instead of falling through with incorrect value
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)

14 years agodocs: recent 7.5.1 bug fixes
Brian Paul [Mon, 24 Aug 2009 19:02:33 +0000 (13:02 -0600)]
docs: recent 7.5.1 bug fixes

14 years agoxlib: fix single buffer window resize bug
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...

14 years agovbo: fix divide by zero exception
Brian Paul [Mon, 24 Aug 2009 18:43:57 +0000 (12:43 -0600)]
vbo: fix divide by zero exception

Fixes bug 23489.

14 years agoglsl: Silence gcc uninitialized variable warning.
Vinson Lee [Mon, 24 Aug 2009 17:43:02 +0000 (11:43 -0600)]
glsl: Silence gcc uninitialized variable warning.

14 years agost/mesa: flush bitmap cache if Z value changes
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>

14 years agotgsi: check for SOA dependencies in SSE and PPC code generators
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.

14 years agotgsi: handle SOA dependencies for MOV/SWZ
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.

14 years agotgsi: added tgsi_full_instruction::Flags field
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.

14 years agotgsi/ppc: we don't implement saturation modes yet
Brian Paul [Tue, 18 Aug 2009 23:50:43 +0000 (17:50 -0600)]
tgsi/ppc: we don't implement saturation modes yet

14 years agotgsi/sse: 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.

14 years agomesa: when emitting vertex program fog, set yzw=0,0,1
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.

14 years agoprogs/demos: print more info in fbotexture.c
Brian Paul [Fri, 14 Aug 2009 20:15:18 +0000 (14:15 -0600)]
progs/demos: print more info in fbotexture.c

14 years agogallium: Always map for READ flag when DISCARD is not set.
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.

14 years agotrace: Remove space next to the class attribute of the trace.
José Fonseca [Fri, 14 Aug 2009 17:47:56 +0000 (18:47 +0100)]
trace: Remove space next to the class attribute of the trace.

14 years agopython/retrace: Open bz2 files correctly.
José Fonseca [Sun, 31 May 2009 19:53:22 +0000 (12:53 -0700)]
python/retrace: Open bz2 files correctly.

14 years agodocs: docs: document new --with-max-width/height config options
Brian Paul [Fri, 14 Aug 2009 17:24:20 +0000 (11:24 -0600)]
docs: docs: document new --with-max-width/height config options

14 years agoAdd a FAQ about internal buffer sizes.
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)

14 years agoAdd configure options for MAX_WIDTH/HEIGHT.
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)

14 years agoAllow external settings of MAX_WIDTH/HEIGHT.
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)

14 years agomesa: move assertions in test_attachment_completeness()
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.

14 years agomesa: fix some invalid memory reads
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.

14 years agoprogs/tests: hack a PBO/dlist test
Brian Paul [Thu, 13 Aug 2009 20:07:25 +0000 (14:07 -0600)]
progs/tests: hack a PBO/dlist test

14 years agomesa: fix warnings about locals hiding function params
Brian Paul [Thu, 13 Aug 2009 20:05:52 +0000 (14:05 -0600)]
mesa: fix warnings about locals hiding function params

14 years agomesa: add missing PBO mapping code in unpack_image()
Brian Paul [Thu, 13 Aug 2009 20:00:21 +0000 (14:00 -0600)]
mesa: add missing PBO mapping code in unpack_image()

14 years agomain: fix some potential memory leaks
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.

14 years agomesa: fix some potential uninitialized memory references
Brian Paul [Thu, 13 Aug 2009 19:44:31 +0000 (13:44 -0600)]
mesa: fix some potential uninitialized memory references

14 years agoglsl: fix some uninitialized pointers
Brian Paul [Thu, 13 Aug 2009 19:44:01 +0000 (13:44 -0600)]
glsl: fix some uninitialized pointers

14 years agodraw: cope with more primitives in draw_pipeline_run
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)

14 years agodri: Fix problems with unitialized values in dri screen object.
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>
14 years agoutil: fix incorrect assertion
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.

14 years agoutil: include u_surface.h, added comment
Brian Paul [Thu, 6 Aug 2009 20:54:25 +0000 (14:54 -0600)]
util: include u_surface.h, added comment

14 years agoutil: use util_same_surface() to compare surface pointers
Brian Paul [Thu, 6 Aug 2009 15:02:36 +0000 (09:02 -0600)]
util: use util_same_surface() to compare surface pointers

14 years agoutil: added util_same_surface() helper function
Brian Paul [Thu, 6 Aug 2009 15:02:05 +0000 (09:02 -0600)]
util: added util_same_surface() helper function

14 years agoEnsure GL_EXT_blend_equation_separate is enabled when 2.0 is enabled.
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.

14 years agodocs:fix glBlitFramebuffer() for Gallium
Brian Paul [Wed, 5 Aug 2009 19:50:21 +0000 (13:50 -0600)]
docs:fix glBlitFramebuffer() for Gallium

14 years agost/mesa: implement BlitFramebuffer() for depth/stencil (incomplete)
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.

14 years agomesa: generate GL_INVALID_OPERATION for missing z/stencil when blitting
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.

14 years agost/mesa: fix Y inversion and optimize st_BlitFramebuffer()
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.

14 years agoutil: added comment/question about blit clipping
Brian Paul [Wed, 5 Aug 2009 19:22:26 +0000 (13:22 -0600)]
util: added comment/question about blit clipping

14 years agomesa: make _mesa_clip_blit() a shared function
Brian Paul [Wed, 5 Aug 2009 19:21:59 +0000 (13:21 -0600)]
mesa: make _mesa_clip_blit() a shared function

14 years agoutil: added util_blit_pixels() overlap test
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.

14 years agoutil: fix util_blit_pixels() test for surface_copy() path
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

14 years agoutil: reformatting and comments
Brian Paul [Wed, 5 Aug 2009 18:40:50 +0000 (12:40 -0600)]
util: reformatting and comments

14 years agodocs: 7.5.1 bug fixes
Brian Paul [Tue, 4 Aug 2009 15:27:49 +0000 (09:27 -0600)]
docs: 7.5.1 bug fixes

14 years agointel: Fix inverted test for disabling flushing of front buffer output.
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)

14 years agointel: Wait on the last swapbuffers to complete before queuing a new one.
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)

14 years agotexenv: Use VP->Current, since _Current isn't updated at this point.
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)

14 years agotexenv: Match state.c in deciding whether we'll be using a vertex shader.
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)

14 years agotexenv: Add missing dependency on VP changes.
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

14 years agomklib: Ensure target directory exists for library
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)

14 years agoAdd missing X11_INCLUDES to egl/drivers/demo and egl/main.
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)

14 years agoxdemo/glxswapcontrol: Move get_framge_usage after the swap.
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>
14 years agoxdemos/glxcontexts: Don't leak visual info when choosing visual again.
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>
14 years agost/mesa: we don't support GL_NV_point_sprite (see comment)
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)

14 years agomesa: move misplaced return statement
Brian Paul [Thu, 30 Jul 2009 15:02:27 +0000 (09:02 -0600)]
mesa: move misplaced return statement

Fixes regression from commit 7d93f817c9c5222e2bdbaa9fa9f03fc502bfe878

14 years agomesa: add missing return after catching program error
Brian Paul [Thu, 30 Jul 2009 14:20:01 +0000 (08:20 -0600)]
mesa: add missing return after catching program error

14 years agomesa/st: short-circuit glFinish calls on WIN32 only
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.

14 years agomesa/st: recognize no-op scissor state when checking clear_with_quads
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.

14 years agoutil: _debug_printf should print even when DEBUG is not defined
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)

14 years agoglx: assign per screen driver configs (DRISW)
RALOVICH, Kristóf [Thu, 23 Jul 2009 15:05:59 +0000 (17:05 +0200)]
glx: assign per screen driver configs (DRISW)

14 years agoglx: assign per screen driver configs (DRI)
RALOVICH, Kristóf [Thu, 23 Jul 2009 15:05:50 +0000 (17:05 +0200)]
glx: assign per screen driver configs (DRI)

14 years agoglx: assign per screen driver configs (DRI2)
RALOVICH, Kristóf [Thu, 23 Jul 2009 15:05:43 +0000 (17:05 +0200)]
glx: assign per screen driver configs (DRI2)

14 years agoglx: properly release DRI configs
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.