mesa.git
11 years agoMerge branch '7.8'
Brian Paul [Thu, 22 Apr 2010 17:10:19 +0000 (11:10 -0600)]
Merge branch '7.8'

Conflicts:

src/mesa/state_tracker/st_format.c

11 years agost/mesa: add cases for MESA_FORMAT_Z24_X8, MESA_FORMAT_X8_Z24
Brian Paul [Thu, 22 Apr 2010 16:26:20 +0000 (10:26 -0600)]
st/mesa: add cases for MESA_FORMAT_Z24_X8, MESA_FORMAT_X8_Z24

11 years agomesa: fix conversion errors in signed_rgba8888[rev] texel fetch
Brian Paul [Thu, 22 Apr 2010 14:46:46 +0000 (08:46 -0600)]
mesa: fix conversion errors in signed_rgba8888[rev] texel fetch

Without the cast the returned texel colors were wrong.
Also, we don't need the "& 0xff" part anymore.
Bug found by Vinson Lee.

11 years agollvmpipe: Fix resource_is_texture.
José Fonseca [Thu, 22 Apr 2010 17:06:05 +0000 (18:06 +0100)]
llvmpipe: Fix resource_is_texture.

It was missing PIPE_BIND_RENDER_TARGET, causing assertion failures for
pure render targets.

Also bind flags are too variable and complex for a good assessment for
whether the resource is a texture or not. Target is more concise.

11 years agollvmpipe: Do not advertise S3TC rendering support.
José Fonseca [Thu, 22 Apr 2010 14:12:30 +0000 (15:12 +0100)]
llvmpipe: Do not advertise S3TC rendering support.

11 years agollvmpipe: Fix typo in assert.
José Fonseca [Thu, 22 Apr 2010 14:11:57 +0000 (15:11 +0100)]
llvmpipe: Fix typo in assert.

11 years agou_format: Reduce code duplication.
José Fonseca [Thu, 22 Apr 2010 14:11:34 +0000 (15:11 +0100)]
u_format: Reduce code duplication.

11 years agogallivm: Remove unused variable.
Vinson Lee [Thu, 22 Apr 2010 07:45:27 +0000 (00:45 -0700)]
gallivm: Remove unused variable.

11 years agor300g: fix vertex unit setup
Alex Deucher [Thu, 22 Apr 2010 06:37:34 +0000 (02:37 -0400)]
r300g: fix vertex unit setup

RV3xx is 2, RV560,RV570 is 8

Noticed by Tormod Volden.

11 years agor300: fix vertex unit setup
Alex Deucher [Thu, 22 Apr 2010 06:33:10 +0000 (02:33 -0400)]
r300: fix vertex unit setup

RV3xx is 2, RV560,RV570 is 8

Noticed by Tormod Volden.

11 years agogallium/util: Fix deviation calculation in u_cache.
Vinson Lee [Thu, 22 Apr 2010 01:45:44 +0000 (18:45 -0700)]
gallium/util: Fix deviation calculation in u_cache.

The approximate deviation calculation was using the entire cache's total
instead of each cache entry's total.

11 years agogallium/tests: Add test case for u_cache.
Vinson Lee [Thu, 22 Apr 2010 01:31:01 +0000 (18:31 -0700)]
gallium/tests: Add test case for u_cache.

11 years agogallivm: added some assertions in loop-gen code
Brian Paul [Thu, 22 Apr 2010 00:22:15 +0000 (18:22 -0600)]
gallivm: added some assertions in loop-gen code

We're hitting these assertions with nested loops...

11 years agoprogs/demos: Fix the progs/demos/rain help text
Aaron Plattner [Thu, 22 Apr 2010 00:13:19 +0000 (18:13 -0600)]
progs/demos: Fix the progs/demos/rain help text

Signed-off-by: Brian Paul <brianp@vmware.com>
11 years agogallivm: fix copy&paste error: s/cont_stack_size/break_stack_size/
Brian Paul [Wed, 21 Apr 2010 23:58:26 +0000 (17:58 -0600)]
gallivm: fix copy&paste error: s/cont_stack_size/break_stack_size/

11 years agogallivm: emit_instruction() is boolean
Brian Paul [Wed, 21 Apr 2010 23:57:44 +0000 (17:57 -0600)]
gallivm: emit_instruction() is boolean

11 years agoprogs/glsl: better comments
Brian Paul [Wed, 21 Apr 2010 22:30:04 +0000 (16:30 -0600)]
progs/glsl: better comments

11 years agollvmpipe: add missing dependency in Makefile
Brian Paul [Wed, 21 Apr 2010 22:29:13 +0000 (16:29 -0600)]
llvmpipe: add missing dependency in Makefile

11 years agogallivm: implement TGSI KILP
Brian Paul [Wed, 21 Apr 2010 22:27:23 +0000 (16:27 -0600)]
gallivm: implement TGSI KILP

As in tgsi_exec.c we don't actually rely on condition codes; we do
an unconditional kill.  The only predication comes from the execution
mask which applies inside loops/conditionals.

11 years agodraw: Make LLVM integration work without llvmpipe too (e.g. sofptipe).
José Fonseca [Wed, 21 Apr 2010 16:30:39 +0000 (17:30 +0100)]
draw: Make LLVM integration work without llvmpipe too (e.g. sofptipe).

Prevents the assertion failure.

11 years agoradeon: fix warning
Marek Olšák [Wed, 21 Apr 2010 20:53:11 +0000 (22:53 +0200)]
radeon: fix warning

11 years agor300g: raise the max index for generic varyings to 32
Marek Olšák [Wed, 21 Apr 2010 20:48:07 +0000 (22:48 +0200)]
r300g: raise the max index for generic varyings to 32

This should fix an assertion failure in the game Heroes of Newearth.
Yes, the game seems to generate semantic indices greater than 15.

11 years agosoftpipe: call draw_wide_point_sprites()
Brian Paul [Wed, 21 Apr 2010 20:23:42 +0000 (14:23 -0600)]
softpipe: call draw_wide_point_sprites()

11 years agogallium/draw: fix point sprite handling
Brian Paul [Wed, 21 Apr 2010 20:24:26 +0000 (14:24 -0600)]
gallium/draw: fix point sprite handling

New draw API function to indicate whether or not to convert points to
quads for sprite rasterization.

Fix point-to-quad conversion regression in the wide-point stage.  We
need to check the pipe_rasterizer_state::point_quad_rasterization flag.

11 years agogallium/draw: use local var to simplify code
Brian Paul [Wed, 21 Apr 2010 20:16:02 +0000 (14:16 -0600)]
gallium/draw: use local var to simplify code

11 years agollvmpipe: consolidate texture memory allocation code
Brian Paul [Wed, 21 Apr 2010 16:30:53 +0000 (10:30 -0600)]
llvmpipe: consolidate texture memory allocation code

And fix incorrect allocation of linear memory for display targets.
This fixes fd.o bugs 27761 and 27762.

11 years agost/glx: variable 'i' is an enum
Brian Paul [Wed, 21 Apr 2010 15:58:15 +0000 (09:58 -0600)]
st/glx: variable 'i' is an enum

Now we can get see 'i' as an enum name instead of a plain integer in gdb.

11 years agotargets: Don't check if we should use trace
Jakob Bornecrantz [Wed, 21 Apr 2010 13:48:54 +0000 (14:48 +0100)]
targets: Don't check if we should use trace

Trace does its own checking, and it used the GALLIUM_TRACE variable
as well, but expected a file and not a bool argument.

11 years agomesa/st: Translate a few more mesa/gallium formats.
José Fonseca [Wed, 21 Apr 2010 09:19:39 +0000 (11:19 +0200)]
mesa/st: Translate a few more mesa/gallium formats.

These endup used by Xvnc.

11 years agollvmpipe: Remove unused variable.
Vinson Lee [Wed, 21 Apr 2010 05:56:39 +0000 (22:56 -0700)]
llvmpipe: Remove unused variable.

11 years agomesa: do version checking for GL 3.x queries
Brian Paul [Wed, 21 Apr 2010 03:17:35 +0000 (21:17 -0600)]
mesa: do version checking for GL 3.x queries

11 years agomesa: API and state for GL 3.1 primitive restart
Brian Paul [Wed, 21 Apr 2010 03:02:09 +0000 (21:02 -0600)]
mesa: API and state for GL 3.1 primitive restart

11 years agomesa: add GL 3.2 GL_CONTEXT_PROFILE_MASK query
Brian Paul [Wed, 21 Apr 2010 02:52:56 +0000 (20:52 -0600)]
mesa: add GL 3.2 GL_CONTEXT_PROFILE_MASK query

11 years agomesa: remove some comments
Brian Paul [Wed, 21 Apr 2010 02:44:54 +0000 (20:44 -0600)]
mesa: remove some comments

11 years agointel: Add Sandybridge mobile chipset id
Zhenyu Wang [Mon, 19 Apr 2010 08:27:10 +0000 (16:27 +0800)]
intel: Add Sandybridge mobile chipset id

Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
11 years agointel: Clean up chipset name and gen num for Ironlake
Zhenyu Wang [Mon, 19 Apr 2010 07:51:50 +0000 (15:51 +0800)]
intel: Clean up chipset name and gen num for Ironlake

Rename old IGDNG to Ironlake, and set 'gen' number for
Ironlake as 5, so tracking the features with generation num
instead of special is_ironlake flag.

Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
11 years agogallivm: Remove unnecessary headers.
Vinson Lee [Wed, 21 Apr 2010 01:48:04 +0000 (18:48 -0700)]
gallivm: Remove unnecessary headers.

11 years agoi965g: s/inttypes.h/stdint.h/
Vinson Lee [Wed, 21 Apr 2010 00:22:26 +0000 (17:22 -0700)]
i965g: s/inttypes.h/stdint.h/

MSVC doesn't have either but Mesa has stdint.h at include/c99.

11 years agoi965g: Remove unnecessary header.
Vinson Lee [Wed, 21 Apr 2010 00:02:03 +0000 (17:02 -0700)]
i965g: Remove unnecessary header.

11 years agollvmpipe: Change return type of declaration to match code.
Vinson Lee [Tue, 20 Apr 2010 23:40:55 +0000 (16:40 -0700)]
llvmpipe: Change return type of declaration to match code.

Commit 2142108e0e1cf1ed8d0142e9c41fe1947abe0907 changed the return type
of llvmpipe_get_texture_image_address function but didn't change the
declaration.

Fixes build.

11 years agollvmpipe: code consolidation
Brian Paul [Tue, 20 Apr 2010 23:28:33 +0000 (17:28 -0600)]
llvmpipe: code consolidation

11 years agollvmpipe: remove debug code and simplify
Brian Paul [Tue, 20 Apr 2010 23:19:30 +0000 (17:19 -0600)]
llvmpipe: remove debug code and simplify

11 years agollvmpipe: fix cube face addressing bug
Brian Paul [Tue, 20 Apr 2010 23:14:47 +0000 (17:14 -0600)]
llvmpipe: fix cube face addressing bug

Fixes fd.o bug 27760 (pigit fbo-cubemap).

11 years agollvmpipe: whitespace fix
Brian Paul [Tue, 20 Apr 2010 23:14:21 +0000 (17:14 -0600)]
llvmpipe: whitespace fix

11 years agogallium: Fix copy typo
Jakob Bornecrantz [Tue, 20 Apr 2010 22:59:38 +0000 (23:59 +0100)]
gallium: Fix copy typo

11 years agosvga: Minor clean up of winsys
Jakob Bornecrantz [Tue, 20 Apr 2010 22:31:39 +0000 (23:31 +0100)]
svga: Minor clean up of winsys

11 years agoradeong: Minor clean up of winsys
Jakob Bornecrantz [Tue, 20 Apr 2010 22:31:25 +0000 (23:31 +0100)]
radeong: Minor clean up of winsys

Also try to wrap trace around driver on non-debug builds, its free.

11 years agonouveau: Minor clean up of winsys
Jakob Bornecrantz [Tue, 20 Apr 2010 22:31:07 +0000 (23:31 +0100)]
nouveau: Minor clean up of winsys

11 years agoi965g: Minor clean up of winsys
Jakob Bornecrantz [Tue, 20 Apr 2010 22:30:41 +0000 (23:30 +0100)]
i965g: Minor clean up of winsys

11 years agoi915g: Minor clean up of winsys
Jakob Bornecrantz [Tue, 20 Apr 2010 22:28:19 +0000 (23:28 +0100)]
i915g: Minor clean up of winsys

11 years agost/egl: No need to use drm_api argument struct
Jakob Bornecrantz [Tue, 20 Apr 2010 22:51:56 +0000 (23:51 +0100)]
st/egl: No need to use drm_api argument struct

11 years agost/egl: Use correct driver_name field to get kernel driver name
Jakob Bornecrantz [Tue, 20 Apr 2010 22:51:22 +0000 (23:51 +0100)]
st/egl: Use correct driver_name field to get kernel driver name

11 years agost/egl: Check for null destroy callback on api struct
Jakob Bornecrantz [Tue, 20 Apr 2010 22:44:40 +0000 (23:44 +0100)]
st/egl: Check for null destroy callback on api struct

11 years agomesa: better, smaller error handling code for glGet*()
Brian Paul [Tue, 20 Apr 2010 22:15:14 +0000 (16:15 -0600)]
mesa: better, smaller error handling code for glGet*()

get.o is about 17% smaller.

11 years agomesa: better, smaller error handling code for glEnable/Disable/IsEnabled()
Brian Paul [Tue, 20 Apr 2010 22:13:08 +0000 (16:13 -0600)]
mesa: better, smaller error handling code for glEnable/Disable/IsEnabled()

Use a goto instead of replicating the _mesa_error() call many times.
enable.o is about 15% smaller.

11 years agomesa: raise GL_INVALID_OPERATION for glReadPixels(GL_COLOR_INDEX)
Brian Paul [Tue, 20 Apr 2010 22:12:34 +0000 (16:12 -0600)]
mesa: raise GL_INVALID_OPERATION for glReadPixels(GL_COLOR_INDEX)

We no longer support CI-mode color buffers so this is always an error.

11 years agotargets: Use a valid winsys include path in Makefile.dri
Jakob Bornecrantz [Tue, 20 Apr 2010 21:49:27 +0000 (22:49 +0100)]
targets: Use a valid winsys include path in Makefile.dri

11 years agor300g: Spill a bit more info about implementation errors in surface_copy.
Corbin Simpson [Tue, 20 Apr 2010 20:08:55 +0000 (13:08 -0700)]
r300g: Spill a bit more info about implementation errors in surface_copy.

compiz appears to hit this. Weird.

11 years agonv50: make a working check for user memory vertex/index buffers
Christoph Bumiller [Tue, 20 Apr 2010 20:01:37 +0000 (22:01 +0200)]
nv50: make a working check for user memory vertex/index buffers

11 years agonv50: fix FP result counting for depth output
Christoph Bumiller [Tue, 20 Apr 2010 19:20:55 +0000 (21:20 +0200)]
nv50: fix FP result counting for depth output

11 years agonv50: support vertex index bias
Christoph Bumiller [Tue, 20 Apr 2010 19:18:15 +0000 (21:18 +0200)]
nv50: support vertex index bias

11 years agollvmpipe: fix depth+stencil logic error
Brian Paul [Tue, 20 Apr 2010 19:50:59 +0000 (13:50 -0600)]
llvmpipe: fix depth+stencil logic error

If both Z-test and stencil-test were enabled, we were mis-computing
the vector of updated Z buffer values.
Fixes Z testing bug in progs/demos/fbotexture.c

11 years agollvmpipe: fix comment/typo
Brian Paul [Tue, 20 Apr 2010 17:50:50 +0000 (11:50 -0600)]
llvmpipe: fix comment/typo

11 years agoi915: Map sampler indices to texture units correctly for fragment shaders.
Eric Anholt [Tue, 20 Apr 2010 19:26:49 +0000 (12:26 -0700)]
i915: Map sampler indices to texture units correctly for fragment shaders.

Fixes hang with "gst-launch-0.10 videotestsrc ! video/x-raw-rgb !
glupload !  gleffects effect=heat ! glimagesink" which uses 2 samplers
pointing at GL_TEXTURE1 and GL_TEXTURE2, and piglit
glsl-fs-sampler-numbering.

11 years agoi915: Add missing break; after handling the stub NOISE instructions.
Eric Anholt [Mon, 12 Apr 2010 20:19:53 +0000 (13:19 -0700)]
i915: Add missing break; after handling the stub NOISE instructions.

Bug #27348

11 years agollvmpipe: fix incorrect front-facing value for fragment shader
Brian Paul [Tue, 20 Apr 2010 17:43:58 +0000 (11:43 -0600)]
llvmpipe: fix incorrect front-facing value for fragment shader

The TGSI convention is +1 for front-facing, -1 for back-facing
Fixes glean glsl1 gl_FrontFacing tests.

11 years agollvmpipe: rename mode -> interp
Brian Paul [Tue, 20 Apr 2010 17:23:53 +0000 (11:23 -0600)]
llvmpipe: rename mode -> interp

11 years agollvmpipe: remove dead code/comment
Brian Paul [Tue, 20 Apr 2010 16:56:01 +0000 (10:56 -0600)]
llvmpipe: remove dead code/comment

11 years agonv50: move declaration before code
Brian Paul [Tue, 20 Apr 2010 16:10:21 +0000 (10:10 -0600)]
nv50: move declaration before code

11 years agonv50: fixed void pointer arithment warning
Brian Paul [Tue, 20 Apr 2010 16:09:55 +0000 (10:09 -0600)]
nv50: fixed void pointer arithment warning

11 years agogallium/util: remove bogus return statement
Brian Paul [Tue, 20 Apr 2010 16:08:52 +0000 (10:08 -0600)]
gallium/util: remove bogus return statement

util_surfaces_do_detach() is a void-valued function.

11 years agoprogs/tests: asst. changes to antialias.c
Brian Paul [Mon, 19 Apr 2010 19:56:21 +0000 (13:56 -0600)]
progs/tests: asst. changes to antialias.c

11 years agogallium: replace pipe_resource::_usage with pipe_resource::usage
Brian Paul [Tue, 20 Apr 2010 16:00:03 +0000 (10:00 -0600)]
gallium: replace pipe_resource::_usage with pipe_resource::usage

11 years agonv50: add missing idxbias param to nv50_push_elements_instanced()
Brian Paul [Tue, 20 Apr 2010 15:43:45 +0000 (09:43 -0600)]
nv50: add missing idxbias param to nv50_push_elements_instanced()

11 years agollvmpipe: remove call to llvmpipe_set_texture_image_layout()
Brian Paul [Tue, 20 Apr 2010 14:42:30 +0000 (08:42 -0600)]
llvmpipe: remove call to llvmpipe_set_texture_image_layout()

This would seem to be needed but caused some regressions.
More investigation will be done.

11 years agollvmpipe: Re-enable half float formats.
José Fonseca [Tue, 20 Apr 2010 14:27:42 +0000 (16:27 +0200)]
llvmpipe: Re-enable half float formats.

They should be working now, both textures and vertex/index/buffers.

This reverts commit efc69ca61cf8fe7d2d44d177e7737999b6a114b5.

11 years agogallivm: Universal format support on lp_build_fetch_rgba_aos via util_format_descript...
José Fonseca [Tue, 20 Apr 2010 14:21:08 +0000 (16:21 +0200)]
gallivm: Universal format support on lp_build_fetch_rgba_aos via util_format_description::fetch_rgba_float

This therefore adds support to half float vertex buffers.

11 years agogallivm: Cleanups and bugfixes to aos format translation.
José Fonseca [Tue, 20 Apr 2010 13:09:02 +0000 (15:09 +0200)]
gallivm: Cleanups and bugfixes to aos format translation.

11 years agodraw: Fallback to gallivm for translation of A8R8G8B8/B8G8R8A8/R10G10B10X2/R10G10B10X...
José Fonseca [Tue, 20 Apr 2010 12:02:05 +0000 (14:02 +0200)]
draw: Fallback to gallivm for translation of A8R8G8B8/B8G8R8A8/R10G10B10X2/R10G10B10X2 and other formats.

These need swizzles, and bitshifts.

11 years agogallivm: New function to fetch a pixel into a 4xfloat AoS vector.
José Fonseca [Tue, 20 Apr 2010 11:58:45 +0000 (13:58 +0200)]
gallivm: New function to fetch a pixel into a 4xfloat AoS vector.

11 years agogallivm: Bring aos format back to life.
José Fonseca [Tue, 20 Apr 2010 11:41:10 +0000 (13:41 +0200)]
gallivm: Bring aos format back to life.

Useful for fetching vertices for formats that are straight arrays.

This reverts commit aa364d091e7e2ef2296fb25f92efc79a8c88f77d.

11 years agonvfx: Fix typo.
José Fonseca [Tue, 20 Apr 2010 11:26:36 +0000 (13:26 +0200)]
nvfx: Fix typo.

11 years agodraw: Remove draw_vs_llvm.c.
José Fonseca [Tue, 20 Apr 2010 11:26:24 +0000 (13:26 +0200)]
draw: Remove draw_vs_llvm.c.

To silence some warnings.

Super-seeded by Zack's new llvm middle end.

11 years agollvmpipe: silence warning
Alan Hourihane [Tue, 20 Apr 2010 09:33:56 +0000 (10:33 +0100)]
llvmpipe: silence warning

11 years agoMerge branch 'gallium-index-bias'
José Fonseca [Tue, 20 Apr 2010 09:07:08 +0000 (11:07 +0200)]
Merge branch 'gallium-index-bias'

11 years agodraw: No need to rebase for elt_bias.
José Fonseca [Tue, 20 Apr 2010 09:06:05 +0000 (11:06 +0200)]
draw: No need to rebase for elt_bias.

As we are rebasing to min_index + elt_bias, and the vertex buffer has no
elt_bias.

I still don't know how to exercise this code. I hope this is now right.

11 years agodraw: Fix cache elt_bias implementation.
José Fonseca [Tue, 20 Apr 2010 08:32:06 +0000 (10:32 +0200)]
draw: Fix cache elt_bias implementation.

11 years agogallium/docs: Make it clear that minIndex, maxIndex is exclusively a index buffer...
José Fonseca [Tue, 20 Apr 2010 08:22:28 +0000 (10:22 +0200)]
gallium/docs: Make it clear that minIndex, maxIndex is exclusively a index buffer characteristic.

Unlike the indexBias which is specific to a draw call.

This are the semantics of both D3D and GL ARB_draw_elements_base_vertex
extension.

11 years agodraw: Fix typo resulting from bad regular expression in index bias addition.
José Fonseca [Tue, 20 Apr 2010 08:19:42 +0000 (10:19 +0200)]
draw: Fix typo resulting from bad regular expression in index bias addition.

11 years agodraw llvm: Move dereference of pointer after NULL check.
Vinson Lee [Tue, 20 Apr 2010 07:00:52 +0000 (00:00 -0700)]
draw llvm: Move dereference of pointer after NULL check.

11 years agodraw llvm: Remove unnecessary header.
Vinson Lee [Tue, 20 Apr 2010 06:58:23 +0000 (23:58 -0700)]
draw llvm: Remove unnecessary header.

11 years agoegl: Fix demos to build with user specified Xlib
Dan Nicholson [Tue, 20 Apr 2010 03:25:17 +0000 (20:25 -0700)]
egl: Fix demos to build with user specified Xlib

Commit 88be2171e7 fixed the egl demos on the stable branch, but now
they're spread out across multiple subdirectories.

Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
11 years agoMerge branch '7.8'
Dan Nicholson [Tue, 20 Apr 2010 03:22:48 +0000 (20:22 -0700)]
Merge branch '7.8'

Conflicts:
progs/egl/Makefile

progs/egl/Makefile is gone on master with the egl demos split into
subdirectories. Will require an additional commit.

11 years agoegl: Pass flags to locate Xlib headers and libraries
Dan Nicholson [Sun, 18 Apr 2010 16:33:03 +0000 (09:33 -0700)]
egl: Pass flags to locate Xlib headers and libraries

eglplatform.h pulls in Xlib.h on X11 platforms. Likewise, the egl glx
driver and egl programs needs to link to libX11. Make sure we use the
locations the user told us about.

Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
11 years agoprogs: Fix linking of Xlib demos for non-autoconf builds
Dan Nicholson [Thu, 1 Apr 2010 21:59:10 +0000 (14:59 -0700)]
progs: Fix linking of Xlib demos for non-autoconf builds

The Xlib demos were fixed to use $(X11_LIBS) so that configure could
detect the proper directory to link the library from, but this broke
the non-autoconf builds. Give X11_LIBS a default value to fallback on.
(cherry picked from commit e40fce13e152ecf929c899ed38a8e5f7d198c738)

11 years agoChange libX11 variables to not conflict with AC_PATH_XTRA
Dan Nicholson [Tue, 16 Mar 2010 03:53:56 +0000 (20:53 -0700)]
Change libX11 variables to not conflict with AC_PATH_XTRA

The variable X_LIBS from AC_PATH_XTRA contains only the -L searchdir
parameter and not the -lX11 to link to Xlib. Use X11 prefixed build vars
for linking with Xlib to avoid the conflict.

Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
(cherry picked from commit e725ef171b5a4d5425461f237d9ccab223806913)

11 years agogallium: Respect user's CFLAGS for including X headers
Dan Nicholson [Fri, 2 Apr 2010 13:33:48 +0000 (06:33 -0700)]
gallium: Respect user's CFLAGS for including X headers

This can break on systems that don't have a system X installation.

Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
(cherry picked from commit de4ee20578a79e024b0de83c40648112f42c994e)

Conflicts:

src/gallium/winsys/xlib/Makefile

11 years agoUse X_LIBS from pkg-config, instead of libdir, for locating libX11
Jeff Smith [Sat, 13 Mar 2010 00:55:09 +0000 (18:55 -0600)]
Use X_LIBS from pkg-config, instead of libdir, for locating libX11

Signed-off-by: Jeff Smith <whydoubt@yahoo.com>
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
(cherry picked from commit 8d86d395dcf6a5f192b6987485bb7aef49f1fefc)

11 years agoglapi: GL 3.x xml file
Brian Paul [Tue, 20 Apr 2010 02:42:33 +0000 (20:42 -0600)]
glapi: GL 3.x xml file

Some of the entrypoints defined in other .xml files will need to
be removed in favor of these...

11 years agollvmpipe: remove dead code
Brian Paul [Mon, 19 Apr 2010 23:16:15 +0000 (17:16 -0600)]
llvmpipe: remove dead code