OSDN Git Service
Roland Scheidegger [Mon, 29 Mar 2010 17:52:29 +0000 (19:52 +0200)]
gallium: add new texture formats
These are needed for DX10 and/or OGL3.3.
This just adds the formats nothing handles them yet.
PIPE_FORMAT_R1_UNORM can't be used currently as it requires special filter.
Need to reclassify compressed formats at some point.
Roland Scheidegger [Mon, 29 Mar 2010 17:12:14 +0000 (19:12 +0200)]
gallium/docs: minor fixes
Michal Krol [Tue, 23 Mar 2010 15:21:03 +0000 (16:21 +0100)]
softpipe: Map GS constants, too.
Marek Olšák [Sun, 28 Mar 2010 16:38:30 +0000 (18:38 +0200)]
r300g: print configurable debugging info on non-debug builds
Vinson Lee [Sun, 28 Mar 2010 22:57:23 +0000 (15:57 -0700)]
swrast: Remove unnecessary header.
Vinson Lee [Sun, 28 Mar 2010 20:49:00 +0000 (13:49 -0700)]
progs: Comment out gallium/raw/SConscript from progs/SConscript.
Commit
db5c2235d1accc2adcf1746aec2342bfa67237ba broke the default SCons
build.
NameError: name 'graw' is not defined:
This patch allows the default SCons build to work again until a proper
fix is available.
Keith Whitwell [Sun, 28 Mar 2010 17:42:26 +0000 (10:42 -0700)]
progs/raw: add note about accessing utility functions
Keith Whitwell [Sun, 28 Mar 2010 17:39:46 +0000 (10:39 -0700)]
ws/xlib: Call XFlush after PutImage
Want to see the results.
Keith Whitwell [Sun, 28 Mar 2010 16:53:58 +0000 (09:53 -0700)]
gallium: new raw gallium interface to support standalone tests
Provides basic window system integration behind a simple interface,
allowing tests to be written without dependency on either the driver
or window system.
With a lot of work, could turn into something like glut for gallium.
Keith Whitwell [Sun, 28 Mar 2010 16:30:55 +0000 (09:30 -0700)]
aux/tgsi: fix some minor glitches in string routines
Not sure why we are open-coding these rather than using standard
library functions.
Keith Whitwell [Sat, 27 Mar 2010 00:19:45 +0000 (17:19 -0700)]
st/python: updates for recent interface changes
Still problems at runtime with vertex elements, etc.
Building still disabled.
George Sapountzis [Sun, 28 Mar 2010 16:30:03 +0000 (19:30 +0300)]
drisw: probably better hack for stride and some comments
José Fonseca [Sun, 28 Mar 2010 16:00:46 +0000 (17:00 +0100)]
util: Update MSDN links.
Luca Barbieri [Sun, 28 Mar 2010 14:41:54 +0000 (16:41 +0200)]
gallium/docs: fix formatting mistakes in d3d11ddi.txt
Luca Barbieri [Sat, 27 Mar 2010 22:41:15 +0000 (23:41 +0100)]
gallium/docs: add comparison between Gallium and Direct3D 11 DDI interfaces
Feel free to check it and improve it if necessary.
Marek Olšák [Sat, 27 Mar 2010 23:07:45 +0000 (00:07 +0100)]
r300g: handle TGSI_OPCODE_RET as END
Marek Olšák [Sat, 27 Mar 2010 21:39:54 +0000 (22:39 +0100)]
r300g: disable cliprects
Thanks to Nicolai Hähnle for explaining this register!
George Sapountzis [Sat, 27 Mar 2010 21:34:42 +0000 (23:34 +0200)]
drisw: update comment
Marek Olšák [Sat, 27 Mar 2010 21:25:13 +0000 (22:25 +0100)]
r300g: print errors even on non-debug builds
We really need to get these into bug reports.
Chia-I Wu [Sat, 27 Mar 2010 19:04:38 +0000 (03:04 +0800)]
egl: Make _eglBindContextToSurfaces more readable.
There is no effective changes given how the function is called. It is
still not trivial, but it should be more readable and resemble
_eglBindContextToThread a lot.
Chia-I Wu [Sat, 27 Mar 2010 18:11:16 +0000 (02:11 +0800)]
egl: Always return the previously bound context.
When a newly bound context is the same as the previously bound one,
_eglBindContextToThread should still return the context instead of NULL.
This gives the driver a chance to flush the context.
George Sapountzis [Sat, 27 Mar 2010 19:35:25 +0000 (21:35 +0200)]
drisw: add comment to libGL about stride
George Sapountzis [Sat, 27 Mar 2010 18:32:52 +0000 (20:32 +0200)]
drisw: make stride issue profound
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.
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.
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>
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.
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.
Vinson Lee [Sat, 27 Mar 2010 06:54:16 +0000 (23:54 -0700)]
r300g: Remove unnecessary header.
Vinson Lee [Sat, 27 Mar 2010 01:58:44 +0000 (18:58 -0700)]
gallium: Fix Windows 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.
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>
Chris Li [Mon, 22 Mar 2010 20:27:32 +0000 (13:27 -0700)]
auto detect llvm version
Vinson Lee [Fri, 26 Mar 2010 21:59:06 +0000 (14:59 -0700)]
rtasm: Silence gnu_printf format warnings.
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()