Zack Rusin [Tue, 30 Mar 2010 12:55:17 +0000 (08:55 -0400)]
gallivm: cleanup the code (found by coverity)
the condition can't be false, declerations are ok even if we don't
emit any.
George Sapountzis [Tue, 30 Mar 2010 10:09:16 +0000 (13:09 +0300)]
drisw: fix use after free (bug 27370)
Michel Dänzer [Tue, 30 Mar 2010 10:01:31 +0000 (12:01 +0200)]
Merge branch '7.8'
Conflicts:
Makefile
src/mesa/main/version.h
Resolved by keeping version strings from master (also in the intel driver).
Michel Dänzer [Tue, 30 Mar 2010 09:50:13 +0000 (11:50 +0200)]
glx/dri2: Fix debug build with old dri2proto.
Apparently the higher compiler optimization level in non-debug builds was
eliminating the unused functions referencing the unresolved DRI2 symbols...
Chia-I Wu [Tue, 30 Mar 2010 07:41:31 +0000 (15:41 +0800)]
st/dri: Fix a memory leak in dri1_init_screen.
Free the returned configs upon errors.
Chia-I Wu [Tue, 30 Mar 2010 05:19:59 +0000 (13:19 +0800)]
mesa/es: Use core mesa's mfeatures.h.
Remove mfeatures_es1.h and mfeatures_es2.h. Build the overlay with
either FEATURE_ES1 or FEATURE_ES2 defined.
Chia-I Wu [Tue, 30 Mar 2010 05:13:20 +0000 (13:13 +0800)]
mesa: Add missing features.
Add features tested in the code but missing from mfeatures.h.
This also fixes some tests of features. They should be tested with
"#if", not "#ifdef".
Chia-I Wu [Tue, 30 Mar 2010 04:38:25 +0000 (12:38 +0800)]
mesa: Add umbrella features.
Add FEATURE_GL, FEATURE_ES1, and FEATURE_ES2 for OpenGL, OpenGL ES 1.x,
and OpenGL ES 2.x respectively. Define individual features through the
new umbrella features. There is no real change introduced by this
commit.
Vinson Lee [Tue, 30 Mar 2010 06:11:26 +0000 (23:11 -0700)]
drisw: Remove unnecessary header.
Vinson Lee [Tue, 30 Mar 2010 05:54:35 +0000 (22:54 -0700)]
swrastg: Silence unused value warning.
Vinson Lee [Tue, 30 Mar 2010 05:19:28 +0000 (22:19 -0700)]
r300g: Remove unused variable.
Vinson Lee [Tue, 30 Mar 2010 05:11:37 +0000 (22:11 -0700)]
r300g: Remove unnecessary header.
Corbin Simpson [Mon, 29 Mar 2010 22:10:18 +0000 (15:10 -0700)]
r300g: Bind constantbuf to Draw immediately, don't wait for render.
Doesn't hurt, and reduces code duplication.
Chia-I Wu [Tue, 30 Mar 2010 01:17:20 +0000 (09:17 +0800)]
st/glx: Remove a wrong assertion in choose_pixel_format.
There are X visuals that Gallium or the code does not support. We could
not assert the color format to be supported. Return PIPE_FORMAT_NONE in
such cases and let the caller handle it.
Brian Paul [Tue, 30 Mar 2010 00:13:31 +0000 (18:13 -0600)]
gallivm: use constant size array, added assertion check
Chris Li [Fri, 26 Mar 2010 17:24:34 +0000 (10:24 -0700)]
Add test case for lp_bld_printf()
Chris Li [Fri, 26 Mar 2010 17:23:03 +0000 (10:23 -0700)]
gallivm: added lp_bld_printf() function
Vinson Lee [Mon, 29 Mar 2010 21:56:12 +0000 (14:56 -0700)]
progs/glsl: Add workarounds for Apple GLSL compiler crash.
fsraytrace and vsraytrace were crashing on Mac OS X 10.6.3 in the Apple
GLSL compiler function TPPStreamCompiler::assignOperands. Removing some
const qualifers made the crashes go away.
Vinson Lee [Mon, 29 Mar 2010 20:58:39 +0000 (13:58 -0700)]
progs/glsl: Remove inline keyword.
Fixes MSVC build.
José Fonseca [Mon, 29 Mar 2010 20:10:03 +0000 (21:10 +0100)]
progs/gallium/python: Get tri.py sample working again.
José Fonseca [Mon, 29 Mar 2010 20:09:37 +0000 (21:09 +0100)]
st/python: Update for util_draw_vertex_buffer changes.
José Fonseca [Mon, 29 Mar 2010 20:09:21 +0000 (21:09 +0100)]
st/python: Move surface read/write methods to context.
Zack Rusin [Mon, 29 Mar 2010 20:17:17 +0000 (16:17 -0400)]
gallivm: make sure that the alloca's are the very first thing in the function
otherwise mem2reg can't put them in registers
George Sapountzis [Mon, 29 Mar 2010 18:06:54 +0000 (21:06 +0300)]
st/dri/sw: add drisw_api similarly to dri1_api
I am pretty sure that this is in gallium spirit, so commit. Thanks to Chia-I
for suggesting this.
George Sapountzis [Mon, 29 Mar 2010 18:06:53 +0000 (21:06 +0300)]
ws/sw/dri: s/xm/dri_sw/
Brian Paul [Mon, 29 Mar 2010 18:01:28 +0000 (12:01 -0600)]
docs: fix 7.7.1 release date
(cherry picked from commit
e6f5ca0fa3bff975f2acb3a825d77f095bc9f43e)
Brian Paul [Mon, 29 Mar 2010 17:44:39 +0000 (11:44 -0600)]
progs/glsl: improve the mouse drag/rotate code a little
RALOVICH, Kristóf [Sun, 28 Mar 2010 02:11:29 +0000 (22:11 -0400)]
progs/glsl: let the mouse rotate the scene
Brian Paul [Mon, 29 Mar 2010 17:31:02 +0000 (11:31 -0600)]
glsl: avoid using rcp in length() functions
See prev commit for related info.
Brian Paul [Mon, 29 Mar 2010 17:21:26 +0000 (11:21 -0600)]
glsl: remove rcp from sqrt()
Per a patch from Marek Olšák, we can simply multiply the incoming
value by 1/sqrt(x) instead of using rcp.
We're keeping the x==0 check to avoid generating NaN for sqrt(0).
José Fonseca [Mon, 29 Mar 2010 16:52:10 +0000 (17:52 +0100)]
Revert "python: Temporarily disable python state tracker until transfers are done by contexts"
This reverts commit
50a778661930ec7aa875a9c5235e9910143ec700.
José Fonseca [Mon, 29 Mar 2010 16:31:16 +0000 (17:31 +0100)]
i965g: util_format_is_compressed() -> util_format_is_s3tc().
José Fonseca [Mon, 29 Mar 2010 16:30:56 +0000 (17:30 +0100)]
mesa/st: util_format_is_compressed() -> util_format_is_s3tc().
José Fonseca [Mon, 29 Mar 2010 16:30:35 +0000 (17:30 +0100)]
svga: util_format_is_compressed() -> util_format_is_s3tc().
José Fonseca [Mon, 29 Mar 2010 16:30:09 +0000 (17:30 +0100)]
r300: UTIL_FORMAT_LAYOUT_COMPRESSED -> UTIL_FORMAT_LAYOUT_S3TC.
José Fonseca [Mon, 29 Mar 2010 16:29:27 +0000 (17:29 +0100)]
util: Distinguish between the different compression formats.
In particular, all current uses of util_format_is_compressed() actually
mean s3tc.
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
Ian Romanick [Sun, 28 Mar 2010 23:35:56 +0000 (16:35 -0700)]
mesa: Add 7.8 release MD5 sums
Ian Romanick [Sun, 28 Mar 2010 23:33:53 +0000 (16:33 -0700)]
intel: Bump intel driver date to reflect status as 2010Q1 release
Ian Romanick [Sun, 28 Mar 2010 23:31:08 +0000 (16:31 -0700)]
mesa: set version string to 7.8
Also set the correct release date.
Ian Romanick [Sun, 28 Mar 2010 23:25:47 +0000 (16:25 -0700)]
mesa: Add 7.7.1 release MD5 sums
(cherry picked from commit
0c88e340499c961cc7a06107a727710a67e280ed)
Ian Romanick [Sun, 28 Mar 2010 23:22:44 +0000 (16:22 -0700)]
mesa: set version string to 7.7.1
Also set the correct release date.
(cherry picked from commit
663642b435af2f8ab4b16360783eb367f42486c3)
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!
Vinson Lee [Sat, 27 Mar 2010 21:40:41 +0000 (14:40 -0700)]
progs/tests: Remove duplicate texcompress2 in SConscript.
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.
Vinson Lee [Sat, 27 Mar 2010 21:25:03 +0000 (14:25 -0700)]
i965g: Add brw_winsys_debug.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.
(cherry picked from commit
02ee7c29502966dffa44243bfc8c20c15907b880)
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.
Brian Paul [Sat, 27 Mar 2010 14:59:17 +0000 (08:59 -0600)]
mesa: move/update hash function comments
(cherry picked from commit
535742d75f0096b22d1b8ff203ae561167af18f7)
Brian Paul [Sat, 27 Mar 2010 14:58:59 +0000 (08:58 -0600)]
mesa: fix deadlock in _mesa_HashFindFreeKeyBlock()
Fixes fd.o bug 27340.
(cherry picked from commit
8fe3b3f66ae57a1a6eca7f6dcb0455e14ad92075)
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)