mesa.git
14 years agoidentity: Add id_drm.c to SCons build.
Vinson Lee [Sat, 27 Mar 2010 17:07:14 +0000 (10:07 -0700)]
identity: Add id_drm.c to SCons build.

This was missed in commit f7cbaae13d67c55abe81ac230de37f564365099f.

14 years agost/egl: Fix missing symbols.
Chia-I Wu [Sat, 27 Mar 2010 14:25:26 +0000 (22:25 +0800)]
st/egl: Fix missing symbols.

ximage backend calls gallium_wrap_screen, which requires libidentity.a
and libtrace.a.  There are also some missing symbols in i965 due to the
use of sw wrapper.

14 years agor300g: fix macrotiling for non-square textures
Mathias Fröhlich [Sat, 27 Mar 2010 12:40:38 +0000 (13:40 +0100)]
r300g: fix macrotiling for non-square textures

FDO bug #27338.

Signed-off-by: Marek Olšák <maraeo@gmail.com>
14 years agoglx: try swrastg_dri, if swrast_dri fails
George Sapountzis [Sat, 27 Mar 2010 12:06:05 +0000 (14:06 +0200)]
glx: try swrastg_dri, if swrast_dri fails

This needs a patch for xserver/glx also. An enviroment variable will be added
at some point, it chould be for swrastg only or all gallium drivers.

14 years agor300g: Make SWTCL clear work again.
Corbin Simpson [Sat, 27 Mar 2010 08:07:39 +0000 (01:07 -0700)]
r300g: Make SWTCL clear work again.

Kind of surprised that this was as little as it took. Worrying.

14 years agor300g: Remove unnecessary header.
Vinson Lee [Sat, 27 Mar 2010 06:54:16 +0000 (23:54 -0700)]
r300g: Remove unnecessary header.

14 years agogallium: Fix Windows SCons build.
Vinson Lee [Sat, 27 Mar 2010 01:58:44 +0000 (18:58 -0700)]
gallium: Fix Windows SCons build.

14 years agost/dri: Fix SCons build.
Vinson Lee [Sat, 27 Mar 2010 00:56:13 +0000 (17:56 -0700)]
st/dri: Fix SCons build.

This was missed in commit 4b722bf9fde668dff1c2b55b34eb3f86c78f43fb.
dri_extensions.c was removed from Makefile but not from SConscript.

14 years agogallium/llvmpipe: add PROGS target/rule to Makefile.template
Chris Li [Thu, 25 Feb 2010 01:43:38 +0000 (17:43 -0800)]
gallium/llvmpipe: add PROGS target/rule to Makefile.template

So other directory can share it.
Also remove the libllvmpipe.a dependency from test
programs. It is not needed any more.

Signed-Off-By: Christopher Li <chrisl@vmware.com>
14 years agoauto detect llvm version
Chris Li [Mon, 22 Mar 2010 20:27:32 +0000 (13:27 -0700)]
auto detect llvm version

14 years agortasm: Silence gnu_printf format warnings.
Vinson Lee [Fri, 26 Mar 2010 21:59:06 +0000 (14:59 -0700)]
rtasm: Silence gnu_printf format warnings.

14 years agoMerge branch '7.8'
Michel Dänzer [Fri, 26 Mar 2010 17:42:16 +0000 (18:42 +0100)]
Merge branch '7.8'

Conflicts:
src/mesa/drivers/dri/intel/intel_mipmap_tree.c - left what was in master

14 years agodri/swrast: Fix frontbuffer rendering.
Michel Dänzer [Fri, 26 Mar 2010 15:29:59 +0000 (16:29 +0100)]
dri/swrast: Fix frontbuffer rendering.

Was broken since the endianness fixes.
(cherry picked from commit 4cf14fa80bda5f4ea65bef3a64e748e064d0bde1)

14 years agodri/swrast: Fix missed conversion of one pixel pointer increment.
Michel Dänzer [Fri, 26 Mar 2010 15:29:59 +0000 (16:29 +0100)]
dri/swrast: Fix missed conversion of one pixel pointer increment.

This probably broke the swrast DRI driver when running X in depth 16.
(cherry picked from commit 6ec259eb17dfbb74972b8cffb4e02a9dbab288cc)

14 years agoswrastg: allow for any of the software rasterizers.
George Sapountzis [Fri, 26 Mar 2010 16:44:40 +0000 (18:44 +0200)]
swrastg: allow for any of the software rasterizers.

This function should be put in targets/common or winsys/sw/common and shared
with targers/libgl-xlib and winsys/sw/drm.

For targets/common, you get layering violations in the build system unless
all of drm_api's are moved under targets.

14 years agodri/common: add comment about DRISW wrt DRI1 / DRI2
George Sapountzis [Fri, 26 Mar 2010 16:44:40 +0000 (18:44 +0200)]
dri/common: add comment about DRISW wrt DRI1 / DRI2

14 years agost/dri: add comment about the ifdef in dri_screen.c
George Sapountzis [Fri, 26 Mar 2010 16:44:39 +0000 (18:44 +0200)]
st/dri: add comment about the ifdef in dri_screen.c

14 years agost/dri: factor out common init_screen code
George Sapountzis [Fri, 26 Mar 2010 16:44:39 +0000 (18:44 +0200)]
st/dri: factor out common init_screen code

14 years agost/dri mv __driDriverExtensions to drisw.c and dri2.c
George Sapountzis [Fri, 26 Mar 2010 16:44:39 +0000 (18:44 +0200)]
st/dri mv __driDriverExtensions to drisw.c and dri2.c

14 years agost/dri: fold dri_extensions.c into dri_context.c
George Sapountzis [Fri, 26 Mar 2010 16:44:39 +0000 (18:44 +0200)]
st/dri: fold dri_extensions.c into dri_context.c

14 years agomesa: only call _mesa_update_state() when necessary in glGet functions
Brian Paul [Fri, 26 Mar 2010 16:08:52 +0000 (10:08 -0600)]
mesa: only call _mesa_update_state() when necessary in glGet functions

Only a few state vars require state validation before querying them.
This potentially speeds up state queries.
Encode that info into the state tuple table.

Also, use the new tuple field to indicate when FLUSH_CURRENT() must
be called to validate other state vars.

Based on a patch submitted by Robert Bragg on Feb 12, 2010.

14 years agoswrastg: Use llvmpipe if built but only on scons
Jakob Bornecrantz [Fri, 26 Mar 2010 13:47:20 +0000 (14:47 +0100)]
swrastg: Use llvmpipe if built but only on scons

14 years agoswrastg: Build with scons
Jakob Bornecrantz [Fri, 26 Mar 2010 13:45:36 +0000 (14:45 +0100)]
swrastg: Build with scons

14 years agogallium: Fix DRI driver build warnings under scons
Jakob Bornecrantz [Fri, 26 Mar 2010 13:19:48 +0000 (14:19 +0100)]
gallium: Fix DRI driver build warnings under scons

When building more then one dri driver we would get warnings because
we where defining the same build target multiple times.

Also move all the dri scons targets related code into its own file.

14 years agosvga/drm: Fix build under scons
Jakob Bornecrantz [Fri, 26 Mar 2010 13:32:56 +0000 (14:32 +0100)]
svga/drm: Fix build under scons

14 years agosvga: Fix typo in configure script
Xavier Chantry [Fri, 26 Mar 2010 10:02:03 +0000 (11:02 +0100)]
svga: Fix typo in configure script

Introduced in a82e37b9e9e34175b7542d0c9b4e462833eab202

14 years agor300/compiler: Lower CMP for vertex programs.
Corbin Simpson [Fri, 26 Mar 2010 12:24:44 +0000 (05:24 -0700)]
r300/compiler: Lower CMP for vertex programs.

I think my maths is right?

14 years agoRevert "r300g: add generating texture coordinates for point sprites (WIP)"
Corbin Simpson [Fri, 26 Mar 2010 11:15:53 +0000 (04:15 -0700)]
Revert "r300g: add generating texture coordinates for point sprites (WIP)"

This reverts commit cba6430524198a1bdcdeada03cbe946a454f3935.

Breaks celestia with a hardlock. :T

We really need to sit down and study texture stuffing further.

14 years agonv50: fix FACE semantic check in FP input slot assignments
Christoph Bumiller [Fri, 26 Mar 2010 10:13:01 +0000 (11:13 +0100)]
nv50: fix FACE semantic check in FP input slot assignments

Fixes for instance noise with material shaders in FlightGear.

14 years agortasm: Fix typos in comments.
Vinson Lee [Fri, 26 Mar 2010 05:51:08 +0000 (22:51 -0700)]
rtasm: Fix typos in comments.

14 years agoidentity: Remove unnecessary header.
Vinson Lee [Fri, 26 Mar 2010 05:40:03 +0000 (22:40 -0700)]
identity: Remove unnecessary header.

14 years agoprogs/gallium: Add trivial gallium demos
Jakob Bornecrantz [Thu, 25 Mar 2010 19:53:33 +0000 (20:53 +0100)]
progs/gallium: Add trivial gallium demos

14 years agoi965: Fix readpixels from ReadBuffer != DrawBuffer.
Eric Anholt [Tue, 16 Mar 2010 20:23:23 +0000 (13:23 -0700)]
i965: Fix readpixels from ReadBuffer != DrawBuffer.

Fixes piglit fbo-readdrawpix.
(cherry picked from commit 5782b2a968bb979b651e49bb5fc4162faa842050)

14 years agoi965: Fix inversion for glCopyPixels to/from FBOs.
Eric Anholt [Wed, 24 Mar 2010 21:28:45 +0000 (14:28 -0700)]
i965: Fix inversion for glCopyPixels to/from FBOs.

fixes piglit fbo-copypix.
(cherry picked from commit a589da14dee0c2a32e6e529f1a390b01a3ee4001)

14 years agointel: Rely on allocated region pitch for the miptree pitch.
Eric Anholt [Tue, 16 Mar 2010 23:20:03 +0000 (16:20 -0700)]
intel: Rely on allocated region pitch for the miptree pitch.

Bug #26966: 945 miptree pitch disagreement with libdrm.
(cherry picked from commit da011faf48155a5c02ebc1fe1fa20a4f54b8c657)

14 years agointel: Remove extra tiling setting after allocating a tiled region.
Eric Anholt [Tue, 16 Mar 2010 23:05:53 +0000 (16:05 -0700)]
intel: Remove extra tiling setting after allocating a tiled region.
(cherry picked from commit 32f143b4327521a058dc05f0ab9087a5696b9618)

14 years agointel: Respect src pitch in _mesa_copy_rect().
Eric Anholt [Wed, 17 Mar 2010 17:10:37 +0000 (10:10 -0700)]
intel: Respect src pitch in _mesa_copy_rect().

If a non-zero src_y was used, this would break piglit
depth-level-clamp.
(cherry picked from commit e1e48ea15c1fe448f0b69e086b66c1123dc98bb7)

14 years agodraw: Add EMIT_4UB_BGRA format
Jakob Bornecrantz [Thu, 25 Mar 2010 12:45:42 +0000 (13:45 +0100)]
draw: Add EMIT_4UB_BGRA format

Needed for i915g, also fixed swizzle in draw_vs_aos_io.

14 years agodraw: Use translate function instead of switch cases
Jakob Bornecrantz [Wed, 24 Mar 2010 23:18:30 +0000 (00:18 +0100)]
draw: Use translate function instead of switch cases

14 years agoi915g: Rename winsys prefix to i915_ from intel_
Jakob Bornecrantz [Thu, 25 Mar 2010 18:19:00 +0000 (19:19 +0100)]
i915g: Rename winsys prefix to i915_ from intel_

Since the winsys isn't shared with i965 and never will be

14 years agost/dri: Move common files to common directory
Jakob Bornecrantz [Thu, 25 Mar 2010 17:51:52 +0000 (18:51 +0100)]
st/dri: Move common files to common directory

 27 files changed, 15 insertions(+), 15 deletions(-)
 rename src/gallium/state_trackers/dri/{ => common}/dri1_helper.c (100%)
 rename src/gallium/state_trackers/dri/{ => common}/dri1_helper.h (100%)
 rename src/gallium/state_trackers/dri/{ => common}/dri_context.c (100%)
 rename src/gallium/state_trackers/dri/{ => common}/dri_context.h (100%)
 rename src/gallium/state_trackers/dri/{ => common}/dri_drawable.c (100%)
 rename src/gallium/state_trackers/dri/{ => common}/dri_drawable.h (100%)
 rename src/gallium/state_trackers/dri/{ => common}/dri_extensions.c (100%)
 rename src/gallium/state_trackers/dri/{ => common}/dri_screen.c (100%)
 rename src/gallium/state_trackers/dri/{ => common}/dri_screen.h (100%)
 rename src/gallium/state_trackers/dri/{ => common}/dri_st_api.c (100%)
 rename src/gallium/state_trackers/dri/{ => common}/dri_st_api.h (100%)
 rename src/gallium/state_trackers/dri/{ => common}/dri_wrapper.h (100%)

14 years agost/dri: Reshuffle files and make it obvious which files are shared
Jakob Bornecrantz [Thu, 25 Mar 2010 17:29:51 +0000 (18:29 +0100)]
st/dri: Reshuffle files and make it obvious which files are shared

In short:
git mv ../drisw/Makefile dri/sw
git mv drisw.[c|h] sw
git mv dri2.[c|h] dri1.[c|h] Makefile drm
git rm ../drisw
ln -s <common files> drm/*
ln -s <common files> sw/*

14 years agoRegenerate gl_mangle.h
Tom Fogal [Thu, 25 Mar 2010 22:48:59 +0000 (16:48 -0600)]
Regenerate gl_mangle.h

14 years agoMerge branch '7.8'
Brian Paul [Thu, 25 Mar 2010 22:12:01 +0000 (16:12 -0600)]
Merge branch '7.8'

14 years agoRevert "llvmpipe: optimize the lp_setup_fence() function"
Brian Paul [Thu, 25 Mar 2010 22:06:07 +0000 (16:06 -0600)]
Revert "llvmpipe: optimize the lp_setup_fence() function"

This reverts commit a9063cad0f0190ff88cd20fbad5aa87bf1a943f6.

Not too surprisingly, this change caused some regressions.
Revert it for the time being.
See fd.o bug 27320.

14 years agollvmpipe: disable an assertion
Brian Paul [Thu, 25 Mar 2010 22:04:40 +0000 (16:04 -0600)]
llvmpipe: disable an assertion

We shouldn't try to clear a non-existant z/stencil buffer, so there's
probably a bug elsewhere.  Disable the assertion for now to allow things
to at least run.

14 years agoglapi: return int = 0 from NoOpGeneric()
Brian Paul [Thu, 25 Mar 2010 22:03:13 +0000 (16:03 -0600)]
glapi: return int = 0 from NoOpGeneric()

If a GL function is called w/out a current rendering context, this stub
gets called.  It should return 0 so that non-void-valued functions return
0/NULL instead of a random number.

14 years agogallium: Add propper sanity checks in configure.ac
Jakob Bornecrantz [Thu, 25 Mar 2010 21:21:39 +0000 (22:21 +0100)]
gallium: Add propper sanity checks in configure.ac

14 years agoglslcompiler: Fix build.
Vinson Lee [Thu, 25 Mar 2010 19:58:36 +0000 (12:58 -0700)]
glslcompiler: Fix build.

14 years agost/dri: Don't include sw vs drm dri headers
Jakob Bornecrantz [Thu, 25 Mar 2010 17:28:31 +0000 (18:28 +0100)]
st/dri: Don't include sw vs drm dri headers

14 years agost/dri: Add dri2 prefix for all dri2.c functions
Jakob Bornecrantz [Thu, 25 Mar 2010 16:54:41 +0000 (17:54 +0100)]
st/dri: Add dri2 prefix for all dri2.c functions

14 years agoconfigure:ac add swrastg_dri
George Sapountzis [Thu, 25 Mar 2010 15:01:54 +0000 (17:01 +0200)]
configure:ac add swrastg_dri

14 years agost/dri: add TODO list for DRISW
George Sapountzis [Thu, 25 Mar 2010 15:01:54 +0000 (17:01 +0200)]
st/dri: add TODO list for DRISW

14 years agoswrastg_dri: hack for loader hardcoded stride
George Sapountzis [Thu, 25 Mar 2010 15:01:54 +0000 (17:01 +0200)]
swrastg_dri: hack for loader hardcoded stride

14 years agoswrastg_dri: add winsys and target
George Sapountzis [Thu, 25 Mar 2010 15:01:54 +0000 (17:01 +0200)]
swrastg_dri: add winsys and target

14 years agoswrastg_dri: add state_tracker
George Sapountzis [Thu, 25 Mar 2010 15:01:53 +0000 (17:01 +0200)]
swrastg_dri: add state_tracker

14 years agost/dri: add drisw
George Sapountzis [Thu, 25 Mar 2010 15:01:53 +0000 (17:01 +0200)]
st/dri: add drisw

14 years agost/dri: add dri_wrapper.h
George Sapountzis [Thu, 25 Mar 2010 15:01:53 +0000 (17:01 +0200)]
st/dri: add dri_wrapper.h

14 years agost/dri: export DRI1 surface / pipe
George Sapountzis [Thu, 25 Mar 2010 15:01:53 +0000 (17:01 +0200)]
st/dri: export DRI1 surface / pipe

They will be used by DRISW. Also, add destroy functions.

14 years agost/dri: split out DRI2 code
George Sapountzis [Thu, 25 Mar 2010 15:01:53 +0000 (17:01 +0200)]
st/dri: split out DRI2 code

14 years agost/dri: make get_texture into validate_att
George Sapountzis [Thu, 25 Mar 2010 15:01:52 +0000 (17:01 +0200)]
st/dri: make get_texture into validate_att

This is a wrapper around dri_st_framebuffer_validate for a single attachment.
Also, call validate through hook to make it more generic.

14 years agost/dri: flush_frontbuffer, allocate_textures for dri2
George Sapountzis [Thu, 25 Mar 2010 15:01:52 +0000 (17:01 +0200)]
st/dri: flush_frontbuffer, allocate_textures for dri2

dri_st_framebuffer functions just forward to dri1/dri2 functions.

14 years agost/dri: flush_frontbuffer, allocate_textures for dri1
George Sapountzis [Thu, 25 Mar 2010 15:01:52 +0000 (17:01 +0200)]
st/dri: flush_frontbuffer, allocate_textures for dri1

* ptex is get by flush_frontbuffer, similar to swap_buffers
* comment for allocate_textures
* texture_mask is managed at the st_fb level

14 years agost/dri: minor cosmetic for buffers
George Sapountzis [Thu, 25 Mar 2010 15:01:52 +0000 (17:01 +0200)]
st/dri: minor cosmetic for buffers

14 years agost/dri: minor cosmetic for screen
George Sapountzis [Thu, 25 Mar 2010 15:01:52 +0000 (17:01 +0200)]
st/dri: minor cosmetic for screen

- put extensions above init_screen
- split out destroy_option_cache

14 years agost/dri: add inline for dri2 check done in multiple places
George Sapountzis [Thu, 25 Mar 2010 15:01:51 +0000 (17:01 +0200)]
st/dri: add inline for dri2 check done in multiple places

14 years agodrisw_util: add fields for gallium swrast_dri
George Sapountzis [Thu, 25 Mar 2010 15:01:51 +0000 (17:01 +0200)]
drisw_util: add fields for gallium swrast_dri

14 years agor300g/radeong: fix scons build
Joakim Sindholt [Thu, 25 Mar 2010 14:51:23 +0000 (15:51 +0100)]
r300g/radeong: fix scons build

14 years agoMerge branch 'gallium-targets'
Jakob Bornecrantz [Thu, 25 Mar 2010 13:48:41 +0000 (14:48 +0100)]
Merge branch 'gallium-targets'

14 years agogallium: Fix libgl-xlib path to sw xlib winsys
Jakob Bornecrantz [Thu, 25 Mar 2010 13:42:40 +0000 (14:42 +0100)]
gallium: Fix libgl-xlib path to sw xlib winsys

14 years agor300g: Remove unnecessary header.
Vinson Lee [Thu, 25 Mar 2010 07:20:05 +0000 (00:20 -0700)]
r300g: Remove unnecessary header.

14 years agoprogs/glsl: Fix vsraytrace GLSL compilation error.
Vinson Lee [Thu, 25 Mar 2010 05:53:23 +0000 (22:53 -0700)]
progs/glsl: Fix vsraytrace GLSL compilation error.

Fixes the following GLSL error on Mac OS X.
'=' :  assigning non-constant to 'const 3-component vector of float'

14 years agoprogs/glsl: Add raytracing demos to SCons build.
Vinson Lee [Thu, 25 Mar 2010 05:36:49 +0000 (22:36 -0700)]
progs/glsl: Add raytracing demos to SCons build.

14 years agollvmpipe: fix up some questionable fence code
Brian Paul [Thu, 25 Mar 2010 02:40:31 +0000 (20:40 -0600)]
llvmpipe: fix up some questionable fence code

Jose should probably review this since he wrote the original code.

14 years agollvmpipe: optimize the lp_setup_fence() function
Brian Paul [Thu, 25 Mar 2010 02:49:12 +0000 (20:49 -0600)]
llvmpipe: optimize the lp_setup_fence() function

Avoid emitting fences when not needed.
Speeds up glReadPixels quite a bit when reading image row by row.

14 years agollvmpipe: call lp_fence_signal()
Brian Paul [Thu, 25 Mar 2010 01:28:41 +0000 (19:28 -0600)]
llvmpipe: call lp_fence_signal()

14 years agollvmpipe: added lp_fence_signal()
Brian Paul [Thu, 25 Mar 2010 01:30:27 +0000 (19:30 -0600)]
llvmpipe: added lp_fence_signal()

14 years agoi915g: Correct and add supperted texture formats
Jakob Bornecrantz [Wed, 24 Mar 2010 23:41:21 +0000 (00:41 +0100)]
i915g: Correct and add supperted texture formats

14 years agost/dri: Fix for X server 1.6.0 (DRI2 version 1)
Jakob Bornecrantz [Wed, 24 Mar 2010 23:27:46 +0000 (00:27 +0100)]
st/dri: Fix for X server 1.6.0 (DRI2 version 1)

14 years agollvmpipe: fix texture reference counting bug
Brian Paul [Wed, 24 Mar 2010 22:27:31 +0000 (16:27 -0600)]
llvmpipe: fix texture reference counting bug

We weren't saving the per-scene texture references at the right point.

Fixes piglit cubemap segfault.  The segfault resulted from referencing
texture memory which was prematurely freed because of a missed reference
count.

Fixes fd.o bug 27276.

14 years agoprogs/demos: add other modes/patterns to dissolve demo
Brian Paul [Fri, 19 Mar 2010 17:34:43 +0000 (11:34 -0600)]
progs/demos: add other modes/patterns to dissolve demo

14 years agor100/r200/r300/r600: enable accel for Copy/DrawPixels without kms
Alex Deucher [Fri, 12 Mar 2010 18:58:56 +0000 (13:58 -0500)]
r100/r200/r300/r600: enable accel for Copy/DrawPixels without kms

meta ops should work ok without kms.

14 years agor300: report correct state atom size
Maciej Cencora [Sun, 21 Mar 2010 11:43:38 +0000 (12:43 +0100)]
r300: report correct state atom size

Spotted by Pauli Nieminen

14 years agor300: fix off by one
Maciej Cencora [Sun, 21 Mar 2010 11:12:05 +0000 (12:12 +0100)]
r300: fix off by one

R300_PVS_MAX_CONST_ADDR field holds highest const addr, not
const count.

Fixes missing models and others rendering errors for vertex
program using 256 params.

14 years agor300: fix vertex programs with big number of params (>255) under KMS
Maciej Cencora [Sun, 21 Mar 2010 11:10:06 +0000 (12:10 +0100)]
r300: fix vertex programs with big number of params (>255) under KMS

UMS will probably require some kernel work

14 years agor300: fix wpos/fog handling
Maciej Cencora [Sun, 21 Mar 2010 10:34:19 +0000 (11:34 +0100)]
r300: fix wpos/fog handling

It may happen that the vertex attribute we were going to stuff
the wpos/fog attrs in was already written by vertex program.
In such cases we need to remove instruction accessing these
attributes, so they don't overwrite the wpos/fog related
instructions.

This fixes non-textured models in many wine games.

14 years agor300: clean fog_attr/wpos_attr if code accessing these attributes has been removed...
Maciej Cencora [Sun, 21 Mar 2010 10:19:02 +0000 (11:19 +0100)]
r300: clean fog_attr/wpos_attr if code accessing these attributes has been removed FP during compilation

14 years agogallium: Add warnings incase pipe drivers are not built in targets
Jakob Bornecrantz [Wed, 24 Mar 2010 18:16:29 +0000 (19:16 +0100)]
gallium: Add warnings incase pipe drivers are not built in targets

14 years agogallium: Make scons build dri/xorg drivers again
Jakob Bornecrantz [Wed, 24 Mar 2010 17:42:35 +0000 (18:42 +0100)]
gallium: Make scons build dri/xorg drivers again

14 years agoi965: Handle the negate and abs swizzles on brw_wm_glsl.c immediate args.
Eric Anholt [Wed, 24 Mar 2010 17:26:05 +0000 (10:26 -0700)]
i965: Handle the negate and abs swizzles on brw_wm_glsl.c immediate args.

Fixes piglit glsl-orangebook-ch06-bump, regressed with
4fc57322258a750c0a9cabc77372b5ccde1fa877

14 years agoradeong: Fix scons build
Jakob Bornecrantz [Wed, 24 Mar 2010 17:09:19 +0000 (18:09 +0100)]
radeong: Fix scons build

14 years agogallium: Reorg winsys directories
Jakob Bornecrantz [Tue, 16 Mar 2010 13:54:18 +0000 (13:54 +0000)]
gallium: Reorg winsys directories

Attached output from commit.
 delete mode 100644 src/gallium/winsys/drm/SConscript
 delete mode 100644 src/gallium/winsys/drm/i965/SConscript
 delete mode 100644 src/gallium/winsys/drm/intel/Makefile
 delete mode 100644 src/gallium/winsys/drm/intel/SConscript
 delete mode 100644 src/gallium/winsys/drm/nouveau/Makefile
 delete mode 100644 src/gallium/winsys/drm/radeon/Makefile
 delete mode 100644 src/gallium/winsys/drm/radeon/SConscript
 delete mode 100644 src/gallium/winsys/drm/vmware/Makefile
 delete mode 100644 src/gallium/winsys/drm/vmware/SConscript
 rename src/gallium/winsys/{drm/intel/gem => i915/drm}/Makefile (82%)
 rename src/gallium/winsys/{drm/intel/gem => i915/drm}/SConscript (100%)
 rename src/gallium/winsys/{drm/intel/gem => i915/drm}/intel_drm_api.c (100%)
 rename src/gallium/winsys/{drm/intel/gem => i915/drm}/intel_drm_batchbuffer.c (100%)
 rename src/gallium/winsys/{drm/intel/gem => i915/drm}/intel_drm_buffer.c (100%)
 rename src/gallium/winsys/{drm/intel/gem => i915/drm}/intel_drm_fence.c (100%)
 rename src/gallium/winsys/{drm/intel/gem => i915/drm}/intel_drm_winsys.h (100%)
 rename src/gallium/winsys/{drm/i965/gem => i965/drm}/Makefile (78%)
 rename src/gallium/winsys/{drm/i965/gem => i965/drm}/SConscript (100%)
 rename src/gallium/winsys/{drm/i965/gem => i965/drm}/i965_drm_api.c (98%)
 rename src/gallium/winsys/{drm/i965/gem => i965/drm}/i965_drm_buffer.c (100%)
 rename src/gallium/winsys/{drm/i965/gem => i965/drm}/i965_drm_winsys.h (100%)
 rename src/gallium/winsys/{drm => }/i965/xlib/Makefile (97%)
 rename src/gallium/winsys/{drm => }/i965/xlib/xlib_i965.c (100%)
 rename src/gallium/winsys/{drm => }/nouveau/drm/Makefile (79%)
 rename src/gallium/winsys/{drm => }/nouveau/drm/nouveau_dri.h (100%)
 rename src/gallium/winsys/{drm => }/nouveau/drm/nouveau_drm_api.c (100%)
 rename src/gallium/winsys/{drm => }/nouveau/drm/nouveau_drm_api.h (100%)
 rename src/gallium/winsys/{drm/radeon/core => radeon/drm}/Makefile (79%)
 rename src/gallium/winsys/{drm/radeon/core => radeon/drm}/SConscript (100%)
 rename src/gallium/winsys/{drm/radeon/core => radeon/drm}/radeon_buffer.h (100%)
 rename src/gallium/winsys/{drm/radeon/core => radeon/drm}/radeon_drm.c (100%)
 rename src/gallium/winsys/{drm/radeon/core => radeon/drm}/radeon_drm.h (100%)
 rename src/gallium/winsys/{drm/radeon/core => radeon/drm}/radeon_drm_buffer.c (100%)
 rename src/gallium/winsys/{drm/radeon/core => radeon/drm}/radeon_r300.c (100%)
 rename src/gallium/winsys/{drm/radeon/core => radeon/drm}/radeon_r300.h (100%)
 rename src/gallium/winsys/{drm/radeon/core => radeon/drm}/radeon_winsys.h (100%)
 rename src/gallium/winsys/{drm/vmware/core => svga/drm}/Makefile (63%)
 rename src/gallium/winsys/{drm/vmware/core => svga/drm}/SConscript (100%)
 rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_buffer.c (100%)
 rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_buffer.h (100%)
 rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_context.c (100%)
 rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_context.h (100%)
 rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_fence.c (100%)
 rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_fence.h (100%)
 rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_screen.c (100%)
 rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_screen.h (100%)
 rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_screen_dri.c (100%)
 rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_screen_ioctl.c (100%)
 rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_screen_pools.c (100%)
 rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_screen_svga.c (100%)
 rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_surface.c (100%)
 rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_surface.h (100%)
 rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmwgfx_drm.h (100%)
 rename src/gallium/winsys/{drm/i965 => sw}/Makefile (61%)
 copy src/gallium/winsys/{drm/sw => sw/drm}/Makefile (73%)
 rename src/gallium/winsys/{drm/sw => sw/drm}/sw_drm_api.c (98%)
 rename src/gallium/winsys/{drm/sw => sw/drm}/sw_drm_api.h (100%)
 rename src/gallium/winsys/{ => sw}/gdi/SConscript (100%)
 rename src/gallium/winsys/{ => sw}/gdi/gdi_sw_winsys.c (100%)
 rename src/gallium/winsys/{ => sw}/gdi/gdi_sw_winsys.h (100%)
 rename src/gallium/winsys/{ => sw}/null/Makefile (78%)
 rename src/gallium/winsys/{ => sw}/null/SConscript (100%)
 rename src/gallium/winsys/{ => sw}/null/null_sw_winsys.c (100%)
 rename src/gallium/winsys/{ => sw}/null/null_sw_winsys.h (100%)
 rename src/gallium/winsys/{drm/sw => sw/wrapper}/Makefile (65%)
 rename src/gallium/winsys/{drm/sw => sw/wrapper}/wrapper_sw_winsys.c (100%)
 rename src/gallium/winsys/{drm/sw => sw/wrapper}/wrapper_sw_winsys.h (100%)
 rename src/gallium/winsys/{ => sw}/xlib/Makefile (79%)
 rename src/gallium/winsys/{ => sw}/xlib/SConscript (100%)
 rename src/gallium/winsys/{ => sw}/xlib/xlib_sw_winsys.c (100%)

14 years agogallium: Move xorg drivers to targets
Jakob Bornecrantz [Wed, 24 Mar 2010 10:45:30 +0000 (11:45 +0100)]
gallium: Move xorg drivers to targets

Attached output from git commit:
 rename src/gallium/{winsys/drm/intel/xorg => targets/xorg-i915}/Makefile (95%)
 rename src/gallium/{winsys/drm/intel/xorg => targets/xorg-i915}/intel_xorg.c (98%)
 rename src/gallium/{winsys/drm/i965/xorg => targets/xorg-i965}/Makefile (78%)
 rename src/gallium/{winsys/drm/i965/xorg => targets/xorg-i965}/intel_xorg.c (98%)
 rename src/gallium/{winsys/drm/nouveau/xorg => targets/xorg-nouveau}/Makefile (96%)
 rename src/gallium/{winsys/drm/nouveau/xorg => targets/xorg-nouveau}/nouveau_xorg.c (98%)
 rename src/gallium/{winsys/drm/radeon/xorg => targets/xorg-radeon}/Makefile (73%)
 rename src/gallium/{winsys/drm/radeon/xorg => targets/xorg-radeon}/radeon_xorg.c (98%)
 rename src/gallium/{winsys/drm/vmware/xorg => targets/xorg-vmwgfx}/Makefile (97%)
 rename src/gallium/{winsys/drm/vmware/xorg => targets/xorg-vmwgfx}/SConscript (100%)
 rename src/gallium/{winsys/drm/vmware/xorg => targets/xorg-vmwgfx}/vmw_driver.h (100%)
 rename src/gallium/{winsys/drm/vmware/xorg => targets/xorg-vmwgfx}/vmw_hook.h (100%)
 rename src/gallium/{winsys/drm/vmware/xorg => targets/xorg-vmwgfx}/vmw_ioctl.c (99%)
 rename src/gallium/{winsys/drm/vmware/xorg => targets/xorg-vmwgfx}/vmw_screen.c (100%)
 rename src/gallium/{winsys/drm/vmware/xorg => targets/xorg-vmwgfx}/vmw_video.c (99%)
 rename src/gallium/{winsys/drm/vmware/xorg => targets/xorg-vmwgfx}/vmw_xorg.c (100%)

14 years agogallium: Move egl drivers to targets
Jakob Bornecrantz [Wed, 24 Mar 2010 09:58:45 +0000 (10:58 +0100)]
gallium: Move egl drivers to targets

Atteched output from git commit:
 rename src/gallium/{winsys/drm => targets}/Makefile.egl (100%)
 rename src/gallium/{winsys/drm/intel/egl => targets/egl-i915}/Makefile (86%)
 rename src/gallium/{winsys/drm/i965/egl => targets/egl-i915}/dummy.c (100%)
 rename src/gallium/{winsys/drm/i965/egl => targets/egl-i965}/Makefile (86%)
 rename src/gallium/{winsys/drm/intel/egl => targets/egl-i965}/dummy.c (100%)
 rename src/gallium/{winsys/drm/nouveau/egl => targets/egl-nouveau}/Makefile (88%)
 rename src/gallium/{winsys/drm/nouveau/egl => targets/egl-nouveau}/dummy.c (100%)
 rename src/gallium/{winsys/drm/radeon/egl => targets/egl-radeon}/Makefile (87%)
 rename src/gallium/{winsys/drm/radeon/egl => targets/egl-radeon}/dummy.c (100%)
 create mode 100644 src/gallium/targets/egl-swrast/Makefile
 create mode 100644 src/gallium/targets/egl-swrast/swrast_glue.c
 rename src/gallium/{winsys/drm/vmware/egl => targets/egl-vmwgfx}/Makefile (86%)
 rename src/gallium/{winsys/drm/swrast/egl => targets/egl-vmwgfx}/dummy.c (100%)
 delete mode 100644 src/gallium/winsys/drm/swrast/Makefile
 delete mode 100644 src/gallium/winsys/drm/swrast/core/Makefile
 delete mode 100644 src/gallium/winsys/drm/swrast/core/swrast_drm_api.c
 delete mode 100644 src/gallium/winsys/drm/swrast/egl/Makefile
 delete mode 100644 src/gallium/winsys/drm/vmware/egl/dummy.c

14 years agogallium: Move dri drivers to targets
Jakob Bornecrantz [Tue, 23 Mar 2010 13:23:26 +0000 (13:23 +0000)]
gallium: Move dri drivers to targets

Attached output from git commit:
 rename src/gallium/{winsys/drm/Makefile.template => targets/Makefile.dri} (100%)
 rename src/gallium/{winsys/drm/intel/dri => targets/dri-i915}/Makefile (75%)
 rename src/gallium/{winsys/drm/intel/dri => targets/dri-i915}/SConscript (100%)
 rename src/gallium/{winsys/drm/i965/dri => targets/dri-i965}/Makefile (76%)
 rename src/gallium/{winsys/drm/i965/dri => targets/dri-i965}/SConscript (100%)
 rename src/gallium/{winsys/drm/nouveau/dri => targets/dri-nouveau}/Makefile (86%)
 rename src/gallium/{winsys/drm/radeon/dri => targets/dri-radeong}/Makefile (85%)
 rename src/gallium/{winsys/drm/radeon/dri => targets/dri-radeong}/SConscript (100%)
 rename src/gallium/{winsys/drm/vmware/dri => targets/dri-vmwgfx}/Makefile (85%)
 rename src/gallium/{winsys/drm/vmware/dri => targets/dri-vmwgfx}/SConscript (100%)

14 years agogallium: Remove GALLIUM_WINSYS_DRM_DIRS
Jakob Bornecrantz [Tue, 16 Mar 2010 13:44:32 +0000 (13:44 +0000)]
gallium: Remove GALLIUM_WINSYS_DRM_DIRS

14 years agoprogs/glsl: remove/replace //-style comments
Brian Paul [Wed, 24 Mar 2010 15:08:24 +0000 (09:08 -0600)]
progs/glsl: remove/replace //-style comments

14 years agoprogs/glsl: silence warnings, remove debug code, adjust window size, etc
Brian Paul [Wed, 24 Mar 2010 15:03:33 +0000 (09:03 -0600)]
progs/glsl: silence warnings, remove debug code, adjust window size, etc

14 years agodemos: import GLSL raytracing demos
RALOVICH, Kristóf [Wed, 24 Mar 2010 01:48:15 +0000 (21:48 -0400)]
demos: import GLSL raytracing demos

14 years agost/mesa: fix typo in prev commit
Brian Paul [Wed, 24 Mar 2010 15:00:48 +0000 (09:00 -0600)]
st/mesa: fix typo in prev commit