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
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)
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)
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.
George Sapountzis [Fri, 26 Mar 2010 16:44:40 +0000 (18:44 +0200)]
dri/common: add comment about DRISW wrt DRI1 / DRI2
George Sapountzis [Fri, 26 Mar 2010 16:44:39 +0000 (18:44 +0200)]
st/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: factor out common init_screen code
George Sapountzis [Fri, 26 Mar 2010 16:44:39 +0000 (18:44 +0200)]
st/dri mv __driDriverExtensions to drisw.c and dri2.c
George Sapountzis [Fri, 26 Mar 2010 16:44:39 +0000 (18:44 +0200)]
st/dri: fold dri_extensions.c into dri_context.c
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.
Jakob Bornecrantz [Fri, 26 Mar 2010 13:47:20 +0000 (14:47 +0100)]
swrastg: Use llvmpipe if built but only on scons
Jakob Bornecrantz [Fri, 26 Mar 2010 13:45:36 +0000 (14:45 +0100)]
swrastg: Build with 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.
Jakob Bornecrantz [Fri, 26 Mar 2010 13:32:56 +0000 (14:32 +0100)]
svga/drm: Fix build under scons
Xavier Chantry [Fri, 26 Mar 2010 10:02:03 +0000 (11:02 +0100)]
svga: Fix typo in configure script
Introduced in
a82e37b9e9e34175b7542d0c9b4e462833eab202
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?
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.
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.
Vinson Lee [Fri, 26 Mar 2010 05:51:08 +0000 (22:51 -0700)]
rtasm: Fix typos in comments.
Vinson Lee [Fri, 26 Mar 2010 05:40:03 +0000 (22:40 -0700)]
identity: Remove unnecessary header.
Jakob Bornecrantz [Thu, 25 Mar 2010 19:53:33 +0000 (20:53 +0100)]
progs/gallium: Add trivial gallium demos
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)
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)
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)
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)
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)
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.
Jakob Bornecrantz [Wed, 24 Mar 2010 23:18:30 +0000 (00:18 +0100)]
draw: Use translate function instead of switch cases
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
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%)
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/*
Tom Fogal [Thu, 25 Mar 2010 22:48:59 +0000 (16:48 -0600)]
Regenerate gl_mangle.h
Brian Paul [Thu, 25 Mar 2010 22:12:01 +0000 (16:12 -0600)]
Merge branch '7.8'
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.
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.
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.
Jakob Bornecrantz [Thu, 25 Mar 2010 21:21:39 +0000 (22:21 +0100)]
gallium: Add propper sanity checks in configure.ac
Vinson Lee [Thu, 25 Mar 2010 19:58:36 +0000 (12:58 -0700)]
glslcompiler: Fix build.
Jakob Bornecrantz [Thu, 25 Mar 2010 17:28:31 +0000 (18:28 +0100)]
st/dri: Don't include sw vs drm dri headers
Jakob Bornecrantz [Thu, 25 Mar 2010 16:54:41 +0000 (17:54 +0100)]
st/dri: Add dri2 prefix for all dri2.c functions
George Sapountzis [Thu, 25 Mar 2010 15:01:54 +0000 (17:01 +0200)]
configure:ac add swrastg_dri
George Sapountzis [Thu, 25 Mar 2010 15:01:54 +0000 (17:01 +0200)]
st/dri: add TODO list for DRISW
George Sapountzis [Thu, 25 Mar 2010 15:01:54 +0000 (17:01 +0200)]
swrastg_dri: hack for loader hardcoded stride
George Sapountzis [Thu, 25 Mar 2010 15:01:54 +0000 (17:01 +0200)]
swrastg_dri: add winsys and target
George Sapountzis [Thu, 25 Mar 2010 15:01:53 +0000 (17:01 +0200)]
swrastg_dri: add state_tracker
George Sapountzis [Thu, 25 Mar 2010 15:01:53 +0000 (17:01 +0200)]
st/dri: add drisw
George Sapountzis [Thu, 25 Mar 2010 15:01:53 +0000 (17:01 +0200)]
st/dri: add dri_wrapper.h
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.
George Sapountzis [Thu, 25 Mar 2010 15:01:53 +0000 (17:01 +0200)]
st/dri: split out DRI2 code
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.
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.
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
George Sapountzis [Thu, 25 Mar 2010 15:01:52 +0000 (17:01 +0200)]
st/dri: minor cosmetic for buffers
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
George Sapountzis [Thu, 25 Mar 2010 15:01:51 +0000 (17:01 +0200)]
st/dri: add inline for dri2 check done in multiple places
George Sapountzis [Thu, 25 Mar 2010 15:01:51 +0000 (17:01 +0200)]
drisw_util: add fields for gallium swrast_dri
Joakim Sindholt [Thu, 25 Mar 2010 14:51:23 +0000 (15:51 +0100)]
r300g/radeong: fix scons build
Jakob Bornecrantz [Thu, 25 Mar 2010 13:48:41 +0000 (14:48 +0100)]
Merge branch 'gallium-targets'
Jakob Bornecrantz [Thu, 25 Mar 2010 13:42:40 +0000 (14:42 +0100)]
gallium: Fix libgl-xlib path to sw xlib winsys
Vinson Lee [Thu, 25 Mar 2010 07:20:05 +0000 (00:20 -0700)]
r300g: Remove unnecessary header.
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'
Vinson Lee [Thu, 25 Mar 2010 05:36:49 +0000 (22:36 -0700)]
progs/glsl: Add raytracing demos to SCons build.
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.
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.
Brian Paul [Thu, 25 Mar 2010 01:28:41 +0000 (19:28 -0600)]
llvmpipe: call lp_fence_signal()
Brian Paul [Thu, 25 Mar 2010 01:30:27 +0000 (19:30 -0600)]
llvmpipe: added lp_fence_signal()
Jakob Bornecrantz [Wed, 24 Mar 2010 23:41:21 +0000 (00:41 +0100)]
i915g: Correct and add supperted texture formats
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)
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.
Brian Paul [Fri, 19 Mar 2010 17:34:43 +0000 (11:34 -0600)]
progs/demos: add other modes/patterns to dissolve demo
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.
Maciej Cencora [Sun, 21 Mar 2010 11:43:38 +0000 (12:43 +0100)]
r300: report correct state atom size
Spotted by Pauli Nieminen
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.
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
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.
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
Jakob Bornecrantz [Wed, 24 Mar 2010 18:16:29 +0000 (19:16 +0100)]
gallium: Add warnings incase pipe drivers are not built in targets
Jakob Bornecrantz [Wed, 24 Mar 2010 17:42:35 +0000 (18:42 +0100)]
gallium: Make scons build dri/xorg drivers again
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
Jakob Bornecrantz [Wed, 24 Mar 2010 17:09:19 +0000 (18:09 +0100)]
radeong: Fix scons build
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%)
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%)
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
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%)
Jakob Bornecrantz [Tue, 16 Mar 2010 13:44:32 +0000 (13:44 +0000)]
gallium: Remove GALLIUM_WINSYS_DRM_DIRS
Brian Paul [Wed, 24 Mar 2010 15:08:24 +0000 (09:08 -0600)]
progs/glsl: remove/replace //-style comments
Brian Paul [Wed, 24 Mar 2010 15:03:33 +0000 (09:03 -0600)]
progs/glsl: silence warnings, remove debug code, adjust window size, etc
RALOVICH, Kristóf [Wed, 24 Mar 2010 01:48:15 +0000 (21:48 -0400)]
demos: import GLSL raytracing demos
Brian Paul [Wed, 24 Mar 2010 15:00:48 +0000 (09:00 -0600)]
st/mesa: fix typo in prev commit
Brian Paul [Wed, 24 Mar 2010 14:34:26 +0000 (08:34 -0600)]
st/mesa: fix sampler_view destruction bug when texture is shared
Since texture's can be shared by many contexts, the texture's sampler
view's context pointer might be invalid by time we delete the texture.
Prevent crashes/etc by setting the sampler view's context to be the
calling context before deleting it. This should be safe as long as
all contexts which share the texture are using the same gallium driver.
That's a reasonable assumption since pipe_texture objects aren't
compatible between different drivers anyway.
Brian Paul [Wed, 24 Mar 2010 14:25:24 +0000 (08:25 -0600)]
st/mesa: code clean-ups, formatting fixes, comments, etc
Brian Paul [Wed, 24 Mar 2010 14:18:13 +0000 (08:18 -0600)]
st/mesa: rename st_clear() to st_Clear()
To be consistent with other Mesa driver functions.
Brian Paul [Wed, 24 Mar 2010 14:16:25 +0000 (08:16 -0600)]
st/mesa: return GL_TRUE/GL_FALSE if return type is GLboolean
Just to be consistent.
Chia-I Wu [Wed, 24 Mar 2010 00:34:39 +0000 (08:34 +0800)]
progs/egl: Link xeglthreads to libpthread.
This should hopefully fix a build failure reported by Chris Ball when
binutils-gold is used.
Brian Paul [Tue, 23 Mar 2010 23:55:41 +0000 (17:55 -0600)]
swrast: improve depth texture mipmap selection
We still don't do proper min/mag filtering but this is better than just
sampling the base mipmap level all the time.
Fixes piglit depth-level-clamp test. Fixes fd.o bug 27256.
Brian Paul [Tue, 23 Mar 2010 23:22:43 +0000 (17:22 -0600)]
st/glx: add support for multiple displays
This is a quick & dirty solution, but it works. See comments in
the code for other ideas.
Fixes regressions/breakage seen in progs/xdemos/glxheads, etc. from commit
6632915e957149c153a3f793c400a532b4995b18.
Brian Paul [Tue, 23 Mar 2010 17:46:02 +0000 (11:46 -0600)]
glslcompiler: added option to do linking of vert/frag shaders
Luca Barbieri [Tue, 23 Mar 2010 21:59:44 +0000 (22:59 +0100)]
dri: fix dri_test.c for non-TLS build
_glapi_Context and _glapi_Dispatch have different constness between
TLS and non-TLS builds.
Luca Barbieri [Tue, 23 Mar 2010 21:57:25 +0000 (22:57 +0100)]
dri: add _glthread_GetID to dri_test.c dummy glapi
Luca Barbieri [Tue, 23 Mar 2010 20:10:07 +0000 (21:10 +0100)]
dri: make unresolved symbol test link work even without a libGL.so
Currently the test link uses -lGL to define the glapi symbols.
This makes it impossible to build DRI drivers on systems without
Mesa installed and without building the libGL from the Mesa tree
first.
Some automated build systems trigger this problem.
This commit removes -lGL and instead adds a dummy implementation of
glapi to dri_test.c
This, along with Kristian's commit, should fix all known regressions
due to the addition of unresolved symbol checking.
projects / mesa.git / log