Vinson Lee [Fri, 12 Feb 2010 19:59:37 +0000 (11:59 -0800)]
progs/tests: Add checks for GL_NV_vertex_program.
Jerome Glisse [Fri, 12 Feb 2010 18:25:16 +0000 (19:25 +0100)]
Revert "r600c: substract vbo offset to vbo size"
This reverts commit
325614a882f5371da512536e07c443a172ffb87c.
Ok this was already fixed this commit actualy broke things
Patrice Mandin [Fri, 12 Feb 2010 18:22:41 +0000 (19:22 +0100)]
nouveau: nv30: it may have 8 texture samplers (not 4), but shader engine has 16 texture units
Signed-off-by: Patrice Mandin <patmandin@gmail.com>
Jerome Glisse [Fri, 12 Feb 2010 16:06:19 +0000 (17:06 +0100)]
r600c: substract vbo offset to vbo size
To avoid kernel complaining and to set proper boundary on
vbo, substract the vbo offset to the vbo size.
Andre Maasikas [Fri, 12 Feb 2010 14:20:50 +0000 (16:20 +0200)]
r600: be more exact in vb size calculation
to make kernel cs checker happier, last attribs don't need full stride of
space. Calculate as count-1*stride + size of attrib
Andre Maasikas [Fri, 12 Feb 2010 14:16:56 +0000 (16:16 +0200)]
r600: support GL_SHORT attributes
normalized seems to work with this setting.
Michal Krol [Fri, 12 Feb 2010 13:45:51 +0000 (14:45 +0100)]
Revert "util: Fix descriptors for R32_FLOAT and R32G32_FLOAT formats."
This reverts commit
aa0b671422880b99dc178d43d1e4e1a3f766bf7f.
Michal Krol [Fri, 12 Feb 2010 12:32:35 +0000 (13:32 +0100)]
util: Fix descriptors for R32_FLOAT and R32G32_FLOAT formats.
Fill in ones for missing components.
Patrice Mandin [Fri, 12 Feb 2010 12:23:48 +0000 (13:23 +0100)]
nouveau: nv30: Define number of texture samplers
Signed-off-by: Patrice Mandin <patmandin@gmail.com>
José Fonseca [Fri, 12 Feb 2010 11:00:22 +0000 (11:00 +0000)]
wgl: Do not reach out and destroy contexts on cleanup.
Simply skip cleanup when contexts are still active.
This addresses two issues:
- in some situations the ICD DLL may be unloaded before the DLL that is
using GL contexts is, so we may receive GL calls after stw_cleanup.
- when aborting (exception, or control-c) the contexts may have been left
in an inconsistent state and attempting to destroy can cause
unpredictable results.
José Fonseca [Thu, 11 Feb 2010 16:34:43 +0000 (16:34 +0000)]
gdi: Never fail at DLL load time.
Windows doesn't really expect things to fail at this point -- it
will try many times until it finally gives up, worse, something bad
happens.
The WGL state tracker will gracefully decline to do work even when it
is loaded.
José Fonseca [Thu, 11 Feb 2010 16:32:23 +0000 (16:32 +0000)]
wgl: Fail gracefully whenever 3D could not be enabled for some reason.
José Fonseca [Thu, 11 Feb 2010 14:09:53 +0000 (14:09 +0000)]
svgadump: Several improvements to shader dumping.
Vinson Lee [Fri, 12 Feb 2010 08:41:01 +0000 (00:41 -0800)]
glu/sgi: Initialize member of class primStream.
Vinson Lee [Fri, 12 Feb 2010 08:36:00 +0000 (00:36 -0800)]
glu/sgi: Initialize members of class Arc.
Vinson Lee [Fri, 12 Feb 2010 08:28:44 +0000 (00:28 -0800)]
glu/sgi: Initialize member of class Bin.
Ben Skeggs [Fri, 12 Feb 2010 05:34:33 +0000 (15:34 +1000)]
nouveau: use AVAIL_RING()
Ben Skeggs [Fri, 12 Feb 2010 02:50:24 +0000 (12:50 +1000)]
nouveau: switch to nouveau_bo_new_tile()
Brian Paul [Thu, 11 Feb 2010 23:54:48 +0000 (16:54 -0700)]
svga: check min_index, max_index before assertions
It's possible for min_index and max_index to be ~0 if the min/max
values were not actually set or computed in the state tracker.
Skip some assertions in that case.
This only effects the debug build error checking.
(cherry picked from commit
408f32dc165b36eb5ec0e2bbc7dcecd28f3a62d3)
Karl Schultz [Thu, 11 Feb 2010 23:49:41 +0000 (16:49 -0700)]
main: Fix compiler warning. No need to convert/store depthScale as GLfloat just to convert it back to GLuint to call unpack_depth_span.
Also removes a difference between the 24/8 and 8/24 texstore routines.
Karl Schultz [Thu, 11 Feb 2010 22:52:22 +0000 (15:52 -0700)]
Turn off 64-bit portability problems detection.
Kristian Høgsberg [Thu, 11 Feb 2010 22:04:06 +0000 (17:04 -0500)]
glapi: Avoid #including gl.h
It's only used for a couple of integer types and and might conflict
with other client API header files.
Kristian Høgsberg [Thu, 11 Feb 2010 21:50:46 +0000 (16:50 -0500)]
i915: Remove always-true irq_active struct intel_screen field
Kristian Høgsberg [Thu, 11 Feb 2010 21:47:46 +0000 (16:47 -0500)]
i915: Remove a few DRI1 era struct intel_screen fields
Kristian Høgsberg [Thu, 11 Feb 2010 21:44:21 +0000 (16:44 -0500)]
i915: Drop intelScreenPrivate typedef and just call it struct intel_screen
Kristian Høgsberg [Thu, 11 Feb 2010 21:38:23 +0000 (16:38 -0500)]
i915: Remove unused intelRegion struct
Phew, sure is nice to only have one struct called intel region.
Kristian Høgsberg [Thu, 11 Feb 2010 21:34:11 +0000 (16:34 -0500)]
i915: Remove left-over drmUnmap()
Brian Paul [Thu, 11 Feb 2010 18:34:28 +0000 (11:34 -0700)]
mesa: additional constant/limit assertions
Brian Paul [Thu, 11 Feb 2010 18:33:17 +0000 (11:33 -0700)]
svga: implement PIPE_CAP_MAX_COMBINED_SAMPLERS query
Karl Schultz [Thu, 11 Feb 2010 17:54:18 +0000 (10:54 -0700)]
Add git tips
Brian Paul [Thu, 11 Feb 2010 16:40:49 +0000 (09:40 -0700)]
st/mesa: fix gallium texture level selection for RTT
Fixes invalid texture level when rendering to a texture where
GL_BASE_LEVEL > 0.
This will be cherry-picked to the 7.7 branch after additional
testing.
Brian Paul [Thu, 11 Feb 2010 16:04:03 +0000 (09:04 -0700)]
mesa: remove darwin-x86ppc and dangling darwin refs in Makefile
Brian Paul [Thu, 11 Feb 2010 16:02:53 +0000 (09:02 -0700)]
docs: remove old CVS references
José Fonseca [Thu, 11 Feb 2010 12:14:01 +0000 (12:14 +0000)]
Revert "llvmpipe: Move tile coordinate assertion into a more useful place."
This reverts commit
8c0391726a89414356c705fcc2d5a38d12d0fe2b.
Too pendantic.
José Fonseca [Thu, 11 Feb 2010 11:51:32 +0000 (11:51 +0000)]
scons: Fix drm/intel build.
José Fonseca [Thu, 11 Feb 2010 11:08:30 +0000 (11:08 +0000)]
llvmpipe: Handle TGSI_TOKEN_TYPE_PROPERTY.
Avoids assertion failures with certain shaders.
José Fonseca [Thu, 11 Feb 2010 10:59:41 +0000 (10:59 +0000)]
llvmpipe: Move tile coordinate assertion into a more useful place.
José Fonseca [Thu, 11 Feb 2010 10:58:46 +0000 (10:58 +0000)]
llvmpipe: Clamp both extremes of triangles to framebuffer size.
Fix segmentation fault when triangles crossed the axis.
José Fonseca [Thu, 11 Feb 2010 10:08:10 +0000 (10:08 +0000)]
gallivm: TGSI_OPCODE_CONT is not deprecated.
Note that with FIXME instead of an assertion failure.
Addresses fdo 25956.
Ben Skeggs [Thu, 11 Feb 2010 05:21:31 +0000 (15:21 +1000)]
nouveau: remove u_simple_screen.h includes
Vinson Lee [Thu, 11 Feb 2010 03:01:05 +0000 (19:01 -0800)]
i965g: ifdef out unused functions.
Corbin Simpson [Thu, 11 Feb 2010 02:38:53 +0000 (18:38 -0800)]
r300g: Work around "defect" in r300compiler.
r300compiler doesn't handle half swizzles for vert shaders, which don't
have them. So, for now, disable them.
Vinson Lee [Thu, 11 Feb 2010 02:37:46 +0000 (18:37 -0800)]
st/mesa: Silence uninitialized variable warning in st_cb_bitmap.c.
Vinson Lee [Thu, 11 Feb 2010 02:30:46 +0000 (18:30 -0800)]
swrast: Silence uninitialized variable warnings in ss_tritmp.h.
Vinson Lee [Thu, 11 Feb 2010 02:12:10 +0000 (18:12 -0800)]
os: Do not use Pthreads barrier functions on Mac OS X.
Pthreads barrier functions are not available on some POSIX platforms.
Vinson Lee [Thu, 11 Feb 2010 00:14:28 +0000 (16:14 -0800)]
ffb: Fix build.
Brian Paul [Wed, 10 Feb 2010 23:44:05 +0000 (16:44 -0700)]
gallium: cast to silence waring
Brian Paul [Wed, 10 Feb 2010 23:43:50 +0000 (16:43 -0700)]
gallium: use os_time.h
Brian Paul [Wed, 10 Feb 2010 23:41:41 +0000 (16:41 -0700)]
gallium: use os_time.h in pb_bufmgr_cache.c
Untested, but seems straightforward.
Brian Paul [Wed, 10 Feb 2010 23:37:18 +0000 (16:37 -0700)]
gallium: use os_time.h in u_timed_winsys.c
Brian Paul [Wed, 10 Feb 2010 23:34:24 +0000 (16:34 -0700)]
scons: add another prefix for mingw32 on Fedora
(cherry picked from commit
f1afb352daf0e74751c99254592eef863c64392a)
Ian Romanick [Wed, 10 Feb 2010 23:16:24 +0000 (15:16 -0800)]
dri: Fix one last copy-and-paste brain damage from a previous commit
José Fonseca [Tue, 9 Feb 2010 23:16:26 +0000 (23:16 +0000)]
scons: User friendly message for code generated files
Karl Schultz [Wed, 10 Feb 2010 22:22:07 +0000 (15:22 -0700)]
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/mesa
Karl Schultz [Wed, 10 Feb 2010 22:21:06 +0000 (15:21 -0700)]
Update Visual Studio Project files to compile the shader compiler and build the prebuilt shader header files.
Corbin Simpson [Wed, 10 Feb 2010 09:39:21 +0000 (01:39 -0800)]
r300g: Fix typo.
Thanks to Uros Bizjak for catching it.
Corbin Simpson [Wed, 10 Feb 2010 20:31:18 +0000 (12:31 -0800)]
r300/compiler: r500-fs: Properly set HW register swizzles.
Fixes fallout from
9a1bf52c.
José Fonseca [Wed, 10 Feb 2010 20:23:10 +0000 (20:23 +0000)]
scons: Only build progs when explicitly requested in the command line.
José Fonseca [Wed, 10 Feb 2010 19:59:53 +0000 (19:59 +0000)]
llvmpipe: Map rendertargets when bound as textures.
Fixes gearbox segfault (fdo 25960). Corruption remains.
Ian Romanick [Wed, 10 Feb 2010 19:43:02 +0000 (11:43 -0800)]
dri: Fix copy-and-paste brain damage in previous commit
A number of places in
3cce4a1e10361458630511543b7a8a6438544775 use
TRUE instead of GL_TRUE. This causes build failures in all of the
drivers that I don't typically build. Win.
Reported by sungami on IRC.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Ian Romanick [Mon, 8 Feb 2010 21:11:58 +0000 (13:11 -0800)]
intel: Don't expose GLX_SWAP_EXCHANGE_OML
We can't always guarantee that the swap will happen by exchange, so we
can't expose this mode. GLX_SWAP_UNDEFINED_OML already covers the
case where the swap *might be* by exchange.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
Ian Romanick [Mon, 8 Feb 2010 19:21:29 +0000 (11:21 -0800)]
intel: Expose a minimal number of configs with accumulation buffer
Expose one config per color depth that includes accumulation buffer.
We could probably expose only one config with accumulation buffer, but
that would require figuring out the actual color depth. This is
easier and only exposes 2 useless configs.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
Ian Romanick [Mon, 8 Feb 2010 19:09:15 +0000 (11:09 -0800)]
dri: Allow selective generation of accum. buffer configs
Modify the interface to driCreateConfigs allowing drivers to not
expose configs with an accumuation buffer. All of the drivers calling
function have been updated to pass true for the accumulation
selector. This maintains the current behavior.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
Reviewed-by: Corbin Simpson <MostAwesomeDude@gmail.com>
Ian Romanick [Mon, 8 Feb 2010 18:34:52 +0000 (10:34 -0800)]
intel: Stop exposing useless 24 depth/0 stencil configs
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
Ian Romanick [Mon, 8 Feb 2010 18:33:35 +0000 (10:33 -0800)]
intel: Remove redundant init of depth_bits / stencil_bits in intelInitScreen2
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
Ian Romanick [Mon, 8 Feb 2010 18:32:29 +0000 (10:32 -0800)]
intel: Update comment in intelInitScreen2 to noting DRI2 protocol issues
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
unknown [Wed, 10 Feb 2010 17:55:01 +0000 (10:55 -0700)]
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/mesa
Brian Paul [Wed, 10 Feb 2010 17:49:48 +0000 (10:49 -0700)]
glsl/pp: fix extension enable/disable options
Now the #extension name: disable/enable flags do the right thing.
Fixes glean/glsl1 "Preprocessor test (extension test 3)"
unknown [Wed, 10 Feb 2010 17:49:11 +0000 (10:49 -0700)]
Add new symbol to exports list
Michal Krol [Wed, 10 Feb 2010 17:04:07 +0000 (18:04 +0100)]
Simplify GLSL extension mechanism.
Since extension name and extension name string are the same, collapse
them into one name.
Michal Krol [Wed, 10 Feb 2010 16:55:29 +0000 (17:55 +0100)]
glsl/pp: Fix ifdef directive for extension names.
Brian Paul [Wed, 10 Feb 2010 15:27:03 +0000 (08:27 -0700)]
glsl: GLSL extensions have the GL_ prefix
Both the #extension directive name and the preprocessor symbol start
with the GL_ prefix. For example:
...
New glean/glsl1 tests have been added to test the #extension feature.
Zack Rusin [Wed, 10 Feb 2010 02:12:57 +0000 (21:12 -0500)]
st/xorg: fix a silly offset bug in xv
we were multiplying the difference in the wrong direction.
Kristian Høgsberg [Wed, 10 Feb 2010 12:56:13 +0000 (07:56 -0500)]
r600: Fix typo in __DRI_TEXTURE_FORMAT_RGBA rename
Oops, I n00bed it.
José Fonseca [Wed, 10 Feb 2010 11:25:26 +0000 (11:25 +0000)]
llvmpipe: Fix null pointer dereference when no depth buffer is bound.
José Fonseca [Wed, 10 Feb 2010 11:01:26 +0000 (11:01 +0000)]
llvmpipe: Leave depth buffer in swizzled format.
This fixes several assertion failures due to only Z32 being supported.
Vinson Lee [Wed, 10 Feb 2010 09:24:41 +0000 (01:24 -0800)]
glu/sgi: Initialize member of class Uarray.
Vinson Lee [Wed, 10 Feb 2010 08:35:48 +0000 (00:35 -0800)]
llvmpipe: Remove unnecessary headers.
Zack Rusin [Wed, 10 Feb 2010 05:07:51 +0000 (00:07 -0500)]
scons: export drawllvm after actually checking that llvm is present
Kristian Høgsberg [Wed, 10 Feb 2010 02:01:04 +0000 (21:01 -0500)]
egl_dri2: Only allocate config if we're going to keep it
Small optimization.
Kristian Høgsberg [Wed, 10 Feb 2010 01:49:40 +0000 (20:49 -0500)]
egl_dri2: Initialize config attributes with visual id and class from X
Kristian Høgsberg [Wed, 10 Feb 2010 00:59:33 +0000 (19:59 -0500)]
eglinfo: Also print visual type, assuming X visual types
This may not make a lot of sense for non-X EGL, but for EGL under X
it's very useful.
Kristian Høgsberg [Tue, 9 Feb 2010 21:06:23 +0000 (16:06 -0500)]
egl_dri2: Allow pbuffer and pixmap surfaces for all configs
Pauli Nieminen [Wed, 10 Feb 2010 01:20:02 +0000 (03:20 +0200)]
radeon: Fix printf formatings to match te values.
Pauli Nieminen [Wed, 10 Feb 2010 01:00:12 +0000 (03:00 +0200)]
radeon: Define EXT_framebuffer_object constants to match hw.
This hides the assertion failure in glean/fbo test. Underlying
problem when same texture is set twice to different attachments
will cause assertion.
Brian Paul [Wed, 10 Feb 2010 01:05:42 +0000 (18:05 -0700)]
mesa: move all limit/constant assertions into check_context_limits()
Francisco Jerez [Tue, 9 Feb 2010 23:36:22 +0000 (00:36 +0100)]
Drop incorrectly revived files during the 'gallium-nopointsizeminmax' merge.
Corbin Simpson [Tue, 9 Feb 2010 21:58:53 +0000 (13:58 -0800)]
r300g: One less assert.
This entire codepath needs to be cleaned to be more pliant towards
shader failure.
Corbin Simpson [Tue, 9 Feb 2010 21:53:30 +0000 (13:53 -0800)]
r300g: Don't write non-existent bit on non-r500.
Might help with compiz being funky with MRTs.
Corbin Simpson [Tue, 9 Feb 2010 21:50:54 +0000 (13:50 -0800)]
r300g: Correct colorbuffer measurements.
Also clarify changes from pointminmax.
Corbin Simpson [Tue, 9 Feb 2010 21:50:38 +0000 (13:50 -0800)]
r300g: Be ever-so-slightly more useful on bad shaders.
Kristian Høgsberg [Tue, 9 Feb 2010 20:54:59 +0000 (15:54 -0500)]
configure.ac: Enable egl demos when --enable-egl is passed
Kristian Høgsberg [Tue, 9 Feb 2010 20:52:30 +0000 (15:52 -0500)]
xeglgears: Add test case for eglBindTexImage()
Kristian Høgsberg [Tue, 9 Feb 2010 20:49:28 +0000 (15:49 -0500)]
egl_dri2: Implement eglBindTexImage()
Kristian Høgsberg [Tue, 9 Feb 2010 20:26:14 +0000 (15:26 -0500)]
dri_interface: Introduce DRI tokens for the texBuffer texture formats
This used to take GLX tokens, but the DRI interface can't depend on GLX
defines. We fix this by introducing DRI tokens that have the same value
as the GLX texture format tokens.
Kristian Høgsberg [Tue, 9 Feb 2010 15:57:43 +0000 (10:57 -0500)]
egl_dri2: Use a helper function for looking up and binding extensions
Brian Paul [Tue, 9 Feb 2010 20:10:05 +0000 (13:10 -0700)]
gallium/auxiliary: add -D__STDC_CONSTANT_MACROS
Not sure why this is needed now, after the gallivm re-org.
Brian Paul [Tue, 9 Feb 2010 20:08:23 +0000 (13:08 -0700)]
llvmpipe: remove .s rule (already in Makefile.template)
Brian Paul [Tue, 9 Feb 2010 20:07:58 +0000 (13:07 -0700)]
llvmpipe: lp_tile_surface.c isn't committed yet
Pauli Nieminen [Tue, 9 Feb 2010 19:37:19 +0000 (21:37 +0200)]
radeon: Add some debug output for fbo support