OSDN Git Service
Eric Anholt [Mon, 25 Jan 2010 22:53:50 +0000 (14:53 -0800)]
intel: Don't do client-side frame throttling with DRI2 SwapBuffers.
The server side does the throttling on our behalf now by putting the
client to sleep, so we don't need our previous hacks for limiting the
number of outstanding frames. Same effect as
7d4e674b212c9dc6408c13913a399bd4a2b9a1e3.
Eric Anholt [Mon, 25 Jan 2010 22:48:57 +0000 (14:48 -0800)]
Revert "intel: Use the new DRI2 flush invalidate entrypoint to signal frame done."
This reverts commit
7d4e674b212c9dc6408c13913a399bd4a2b9a1e3. It broke
throttling in the non-new-DRI2 case.
Eric Anholt [Tue, 19 Jan 2010 23:26:56 +0000 (15:26 -0800)]
i965: Remove unnecessary malloc/free in VS binding table setup.
Eric Anholt [Tue, 26 Jan 2010 06:27:46 +0000 (22:27 -0800)]
i965: Fix build after merge of mesa stable branch.
Chia-I Wu [Tue, 26 Jan 2010 03:35:30 +0000 (11:35 +0800)]
docs: Mention EGL and OpenGL ES in 7.8 release notes.
Chia-I Wu [Thu, 21 Jan 2010 09:58:28 +0000 (17:58 +0800)]
glx: Build GLX normally.
GLX was built specially and before Mesa core because libglapi.a could
not be built with IN_DRI_DRIVER defined. This is no longer the case
since
6e99e6ddbf488f6955e34ef0bc438fdcb4d90f74.
It works fine in my (limited) testing with both direct and indirect
rendering. I also compare the outputs after preprocessing (gcc -E) with
or without this commit, and they are identical.
Chia-I Wu [Tue, 26 Jan 2010 02:54:45 +0000 (10:54 +0800)]
docs: Update EGL documentation.
Add --enable-gallium-swrast to the example. Document missing
--with-egl-driver-dir and update TODOs.
Chia-I Wu [Tue, 26 Jan 2010 02:46:32 +0000 (10:46 +0800)]
egl/xdri: Update with glxclient.h change.
__glXFindDisplay is no longer static since
7a9329ba99fe1242c07fbf4fd04e7a4dbeba2e72.
Robert Bragg [Wed, 20 Jan 2010 03:01:14 +0000 (03:01 +0000)]
mesa: misc GLX_INTEL_swap_event fixes
Fixup a few issues found through testing:
- update GLX names to match glproto
- register DRI2WireToEvent so it actually gets called
Signed-off-by: Robert Bragg <robert@linux.intel.com>
Brian Paul [Mon, 25 Jan 2010 21:46:17 +0000 (14:46 -0700)]
Merge branch 'mesa_7_7_branch'
Conflicts:
src/mesa/drivers/dri/intel/intel_screen.c
src/mesa/drivers/dri/intel/intel_swapbuffers.c
src/mesa/drivers/dri/r300/r300_emit.c
src/mesa/drivers/dri/r300/r300_ioctl.c
src/mesa/drivers/dri/r300/r300_tex.c
src/mesa/drivers/dri/r300/r300_texstate.c
Alex Deucher [Mon, 25 Jan 2010 21:19:19 +0000 (16:19 -0500)]
r300: rv350+ support FLT16_2/4 vertex formats
Corbin Simpson [Mon, 25 Jan 2010 19:27:50 +0000 (11:27 -0800)]
r300g: Finish and enable immediate mode.
Based on Marek's immd-mode patch.
Corbin Simpson [Mon, 25 Jan 2010 19:04:55 +0000 (11:04 -0800)]
radeong: Make sure that we're not emitting relocations for local buffers.
Split from Marek's immd-mode patch.
Corbin Simpson [Mon, 25 Jan 2010 19:04:15 +0000 (11:04 -0800)]
radeong: Make is_r3xx inline to avoid warnings.
Split from Marek's immd-mode patch.
Corbin Simpson [Mon, 25 Jan 2010 19:01:16 +0000 (11:01 -0800)]
radeong: Clean up domain usages.
Split from Marek's immd-mode patch.
Corbin Simpson [Mon, 25 Jan 2010 18:52:19 +0000 (10:52 -0800)]
Revert "r300g,radeong: finish and enable the immediate mode"
This reverts commit
112239e9a66a155d36fe2ad0ab130e6f26eff298.
Jakob Bornecrantz [Mon, 25 Jan 2010 19:07:43 +0000 (20:07 +0100)]
st/xorg: Fix crash on resize with libkms
Igor Oliveira [Mon, 25 Jan 2010 16:53:53 +0000 (09:53 -0700)]
vega: fix incorrect samplers, textures indexes in blend_bind_samplers()
Fixes fd.o bug 25863.
Signed-off-by: Brian Paul <brianp@vmware.com>
Luca Barbieri [Wed, 20 Jan 2010 01:39:27 +0000 (17:39 -0800)]
Fix compressed texture loads for non-minimal pitches again
My commit
eea6a7639f767b1d30b6ef1f91a9c49e3f3b78f0 does a memcpy of height
lines, but that's wrong because the texture has a block layout and we
must thus use the number of vertical blocks instead of the height.
Signed-off-by: Brian Paul <brianp@vmware.com>
Chia-I Wu [Mon, 25 Jan 2010 14:29:51 +0000 (22:29 +0800)]
winsys/drm: Correctly install EGL drivers.
Remove extraneous quotes that prevent some drivers to be installed when
there are more than one display in EGL_DISPLAYS.
José Fonseca [Mon, 25 Jan 2010 13:17:47 +0000 (13:17 +0000)]
pipebuffer: Reapply the mesa_7_7_branch's changes.
After the last mesa_7_7_branch merge the old master code remained,
instead of the newer mesa_7_7_branch's code. This commit makes both
branches match, modulo interface changes.
Note: future mesa_7_7_branch -> master merges will most likely hit
conflicts in these files. Unless otherwise stated, the mesa_7_7_branch
is the reference.
José Fonseca [Mon, 25 Jan 2010 11:54:54 +0000 (11:54 +0000)]
llvmpipe: Remove lp_tex_sample_c.c again.
Popped back to life in some merge. Not necessary even as a reference,
since it is identical to softpipe's sp_tex_sample.c with renamed symbols.
Jakob Bornecrantz [Mon, 25 Jan 2010 11:27:47 +0000 (12:27 +0100)]
vmware/xorg: Do buffer round-robin logic differently
Jakob Bornecrantz [Fri, 22 Jan 2010 17:28:40 +0000 (18:28 +0100)]
st/xorg: Improve options and print them to log
Set 2D acceleration to off by default
Get fallback debugging from the Xorg config
Also print if 3D acceleration is enabled
Jakob Bornecrantz [Thu, 21 Jan 2010 20:32:28 +0000 (21:32 +0100)]
vmware/xorg: Export pci_probe function for ugly chain-loading
Jakob Bornecrantz [Thu, 21 Jan 2010 20:23:22 +0000 (21:23 +0100)]
st/xorg: Export helper function for detecting modesetting
Jakob Bornecrantz [Thu, 21 Jan 2010 20:28:14 +0000 (21:28 +0100)]
st/xorg: Fix warning
Corbin Simpson [Mon, 25 Jan 2010 09:12:30 +0000 (01:12 -0800)]
gallium-docs: Add note on scissor.
Marek Olšák [Sun, 17 Jan 2010 23:15:52 +0000 (00:15 +0100)]
r300g,radeong: finish and enable the immediate mode
Nearly 100% performance increase in glxgears.
Marek Olšák [Sun, 17 Jan 2010 22:13:51 +0000 (23:13 +0100)]
r300g: fix zero-area scissor
Marek Olšák [Sat, 16 Jan 2010 23:57:04 +0000 (00:57 +0100)]
r300g,radeong: set tiling flags in libdrm
Marek Olšák [Sat, 23 Jan 2010 16:19:44 +0000 (17:19 +0100)]
radeong: do not emit a zero-sized command stream
Fixing a hardlock introduced in
fcbd285e421903ee0a65f19f5d633b25b5923c24 and
reproducible with piglit/bugs/fdo23489.
Chia-I Wu [Mon, 25 Jan 2010 03:55:48 +0000 (11:55 +0800)]
egl: Native types are renamed in EGL 1.3.
Rename Native*Type to EGLNative*Type.
Chia-I Wu [Mon, 25 Jan 2010 03:39:44 +0000 (11:39 +0800)]
egl: Make resource void pointer in _eglCheckResource.
This emphasizes the fact that the resource to be checked could really be
invalid and have an unknown type.
Chia-I Wu [Mon, 25 Jan 2010 03:34:09 +0000 (11:34 +0800)]
egl: Install EGL headers.
Install EGL (and KHR) headers along with the library.
Chia-I Wu [Sat, 15 Aug 2009 14:58:13 +0000 (22:58 +0800)]
egl: Add support for EGL_KHR_image.
Individual drivers still need to implement the API hooks.
Chia-I Wu [Sat, 15 Aug 2009 14:57:47 +0000 (22:57 +0800)]
egl: Update headers.
Update to the current versions found at
http://www.khronos.org/registry/egl/. There is one modification in
khrplatform.h for GCC visibility.
Igor Oliveira [Sun, 24 Jan 2010 16:26:31 +0000 (12:26 -0400)]
egl: check if driver_name is null
Brian Paul [Mon, 25 Jan 2010 01:18:17 +0000 (18:18 -0700)]
st/mesa: fix int->uint conversion for negative scissor bound values
Based on a patch by Xavier Chantry <chantry.xavier@gmail.com>:
If x+width or y+height is negative, then maxx or maxy will get a bogus value
when converting that to unsigned. Fix this by setting 0 as minimal value.
This was also triggered by teeworlds, but only with some combination of
resolution and map section. For example upper part of dm2 at 1280x1024.
Brian Paul [Mon, 25 Jan 2010 00:54:44 +0000 (17:54 -0700)]
mesa: move _mesa_debug() call earlier in _mesa_Scissor
Part of a patch from Xavier Chantry <chantry.xavier@gmail.com>
Xavier Chantry [Sat, 23 Jan 2010 16:27:21 +0000 (17:27 +0100)]
st/mesa: fix unsigned/signed breakage in scissor
commit
53174afeeb introduced a portability change that converted GLint x,y
to GLuint. That breaks when x and y are negative, which seems to be allowed,
and which at least one game uses : teeworlds.
Rather than simply reverting the change, it seems possible to convert the
16bit unsigned to GLint so that comparisons are made between signed integers
instead. This hopefully does not break anything while keeping MSVC happy.
Signed-off-by: Xavier Chantry <chantry.xavier@gmail.com>
Signed-off-by: Brian Paul <brianp@vmware.com>
Marcin Slusarz [Sun, 24 Jan 2010 18:27:59 +0000 (19:27 +0100)]
nv50: fix uninitialized variable in nv50_revdep_reorder
"unsafe" is never initialized, but used
(found by valgrind)
Marcin Slusarz [Wed, 20 Jan 2010 22:27:07 +0000 (23:27 +0100)]
nv50: fix crash in nv50_pre_pipebuffer_map (nv50_screen->cur_ctx)
nv50_pre_pipebuffer_map references screen->cur_ctx which points
to freed memory after the context is destroyed.
This crash is easily triggerable by progs/xdemos/glxcontexts.
Marcin Slusarz [Sun, 17 Jan 2010 22:51:22 +0000 (23:51 +0100)]
nouveau/winsys: be nice and close the device on destroy
Marcin Slusarz [Sun, 17 Jan 2010 22:50:50 +0000 (23:50 +0100)]
nouveau: fix winsys object leak
Christoph Bumiller [Sun, 24 Jan 2010 13:22:41 +0000 (14:22 +0100)]
nv50: fix handling of FragCoord input
Christoph Bumiller [Sat, 23 Jan 2010 17:35:27 +0000 (18:35 +0100)]
nv50: only flush texture caches on st request
Christoph Bumiller [Sun, 24 Jan 2010 14:13:17 +0000 (15:13 +0100)]
nv50: implement render_condition
Still not handling queries on multiple contexts though.
Chia-I Wu [Sun, 24 Jan 2010 13:04:35 +0000 (21:04 +0800)]
egl: Add and use make_library_path.
Add a platform specific function to turn a library name to a library
path. It is used to convert EGL_DRIVER or the default driver to a
library path that can be loaded.
Chia-I Wu [Sun, 24 Jan 2010 12:53:41 +0000 (20:53 +0800)]
egl: Remove _eglFindAPIs.
This function is not used and should have been removed by last commit.
My mistake.
Chia-I Wu [Sun, 24 Jan 2010 12:44:39 +0000 (20:44 +0800)]
egl: Remove unused helper functions.
_eglFillInConfigs and _eglFindAPIs have no user in Mesa and are unlikely
to find one soon. It should be fine to remove them.
Chia-I Wu [Sun, 24 Jan 2010 12:21:23 +0000 (20:21 +0800)]
egl: Remove unused casting functions.
_eglUIntToPointer and _eglPointerToUInt are no longer used.
Chia-I Wu [Sun, 24 Jan 2010 12:32:34 +0000 (20:32 +0800)]
egl: Make surfaces and contexts resources.
Turn _EGLSurface and _EGLContext into _EGLResource so that they can be
managed uniformly.
Chia-I Wu [Sun, 24 Jan 2010 12:30:04 +0000 (20:30 +0800)]
egl: Add _EGLResource and _EGLResourceType.
Resources are objects managed by a display. They can be linked to or
unlinked from a display. It is also possible to check if a resource is
valid.
Chia-I Wu [Sat, 23 Jan 2010 14:57:23 +0000 (22:57 +0800)]
egl: Move surface functions in egldisplay.[ch] to eglsurface.[ch]
Move functions to where they should be. There should be no real change
here.
Chia-I Wu [Sat, 23 Jan 2010 14:53:59 +0000 (22:53 +0800)]
egl: Move context functions in egldisplay.[ch] to eglcontext.[ch].
Move functions to where they should be. There should be no real change
here.
Chia-I Wu [Sun, 24 Jan 2010 03:03:20 +0000 (11:03 +0800)]
mesa/es: Improve Makefile rules.
Make sure glapi headers are cleaned when "make clean". Make sure all
sources depend on subdirs-stamp-tmp so that sources/headers are
generated first.
subdirs-stamp-tmp will be removed after a successful build. It might be
a problem when a build fails. But it is much better than where we
currently are: glapi headers are never cleaned or re-generated.
Vinson Lee [Sun, 24 Jan 2010 08:17:00 +0000 (00:17 -0800)]
r200: Silence fprintf format warning.
Vinson Lee [Sun, 24 Jan 2010 07:18:33 +0000 (23:18 -0800)]
x86: Do not build read_rgba_span_x86.S on Mac OS X.
read_rgba_span_x86.S uses the pseudo-ops .hidden and .type which are
not recognized on Mac OS X.
Vinson Lee [Sun, 24 Jan 2010 07:12:34 +0000 (23:12 -0800)]
x86: Do not use .hidden pseudo-op on Mac OS X.
The .hidden directive is an unknown pseudo-op on Mac OS X.
Vinson Lee [Sun, 24 Jan 2010 06:59:31 +0000 (22:59 -0800)]
glapi: Do not use .type pseudo-op on Mac OS X.
The .type directive is an unknown pseudo-op on Mac OS X.
Vinson Lee [Sun, 24 Jan 2010 05:43:26 +0000 (21:43 -0800)]
scons: Do not use ld options start-group and end-group on Darwin.
Mac OS X ld does not support these options.
Dave Airlie [Sun, 24 Jan 2010 05:37:23 +0000 (15:37 +1000)]
r300g: avoid the use of goto
I was being lazy on Sunday morning, Droste on irc called me on it ;-)
Vinson Lee [Sun, 24 Jan 2010 05:05:58 +0000 (21:05 -0800)]
scons: Define _DARWIN_C_SOURCE on Darwin builds.
Dave Airlie [Sun, 24 Jan 2010 04:58:45 +0000 (14:58 +1000)]
r300g: fix flushing harder.
I swear ipers runs here after this commit.
After we flush we need to redo the space check
Vinson Lee [Sun, 24 Jan 2010 04:56:49 +0000 (20:56 -0800)]
progs/demos: Remove unnecessary header from shadowtex.c.
Vinson Lee [Sun, 24 Jan 2010 04:43:27 +0000 (20:43 -0800)]
r300: Remove unnecessary headers.
Vinson Lee [Sat, 23 Jan 2010 22:33:29 +0000 (14:33 -0800)]
intel: Remove unnecessary headers.
Chia-I Wu [Sat, 23 Jan 2010 12:18:43 +0000 (20:18 +0800)]
egl: Install drivers to ${libdir}/egl.
Install EGL drivers to EGL_DRIVER_INSTALL_DIR, which is default to
${libdir}/egl.
Chia-I Wu [Sat, 23 Jan 2010 12:09:20 +0000 (20:09 +0800)]
st/vega: Clean up Makefile.
Chia-I Wu [Sat, 23 Jan 2010 12:08:02 +0000 (20:08 +0800)]
st/es: Pass -linker and -ldflags to mklib.
Vinson Lee [Sat, 23 Jan 2010 10:14:56 +0000 (02:14 -0800)]
radeon: Remove unused variable.
Dave Airlie [Sat, 23 Jan 2010 10:07:08 +0000 (20:07 +1000)]
r300: fix wrong call in last commit
Vinson Lee [Sat, 23 Jan 2010 09:54:53 +0000 (01:54 -0800)]
tdfx: Remove unnecessary headers.
Vinson Lee [Sat, 23 Jan 2010 09:40:44 +0000 (01:40 -0800)]
sis: Remove unnecessary headers.
Dave Airlie [Sat, 23 Jan 2010 09:35:42 +0000 (19:35 +1000)]
r300g: fix up buffer emission ordering.
This fixes the code space checking VBOs, then resetting the space list
and space checking other buffers. it fixes demos/ipers
Signed-off-by: Dave Airlie <airlied@redhat.com>
Vinson Lee [Sat, 23 Jan 2010 08:38:14 +0000 (00:38 -0800)]
savage: Remove unnecessary headers.
Vinson Lee [Sat, 23 Jan 2010 08:19:29 +0000 (00:19 -0800)]
mga: Remove unnecessary headers.
Vinson Lee [Sat, 23 Jan 2010 07:53:39 +0000 (23:53 -0800)]
i965: Remove unnecessary headers.
Vinson Lee [Sat, 23 Jan 2010 07:22:16 +0000 (23:22 -0800)]
i915: Remove unnecessary headers.
Dave Airlie [Sat, 23 Jan 2010 02:57:51 +0000 (12:57 +1000)]
r300: only enable half floats on r500s.
Thank to MAD for point it out.
Dave Airlie [Sat, 23 Jan 2010 02:29:33 +0000 (12:29 +1000)]
Merge branch 'arb_half_float_vertex'
Chia-I Wu [Sat, 23 Jan 2010 02:31:21 +0000 (10:31 +0800)]
Revert "add segl"
This reverts commit
fe33b7083b0081b91ee338acbe966400c6b9a7b9. It was
not supposed to be pushed yet.
Dave Airlie [Fri, 22 Jan 2010 21:38:06 +0000 (07:38 +1000)]
r300: half float support
Signed-off-by: Dave Airlie <airlied@redhat.com>
Dave Airlie [Mon, 18 Jan 2010 06:30:56 +0000 (16:30 +1000)]
i965: add support for ARB_half_float_vertex
enables the extension on i965 and adds support to the draw upload for
the vertex format.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Dave Airlie [Mon, 18 Jan 2010 06:29:31 +0000 (16:29 +1000)]
mesa: add core support for ARB_half_float_vertex.
Adds the extension to the list + support to the APIs.
also add t_draw.c support to convert for sw rast.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Dave Airlie [Mon, 18 Jan 2010 06:27:27 +0000 (16:27 +1000)]
glapi: add GL_HALF_FLOAT enum support.
Regenerate enums files and GLX indirect.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Dave Airlie [Mon, 18 Jan 2010 06:25:30 +0000 (16:25 +1000)]
progs: add trivial ARB_half_float_vertex support.
This is just a trivial port of vp-array.c
Signed-off-by: Dave Airlie <airlied@redhat.com>
Chia-I Wu [Sat, 23 Jan 2010 02:23:37 +0000 (10:23 +0800)]
glapi: Include glheader.h in glapi_nop.c.
In addition to OpenGL headers, glheader.h also defines OpenGL ES types
that are used in core Mesa or ES overlay.
Chia-I Wu [Fri, 22 Jan 2010 16:11:48 +0000 (00:11 +0800)]
add segl
Brian Paul [Sat, 23 Jan 2010 01:47:23 +0000 (18:47 -0700)]
glapi: define GLfixed, GLclampx types for ES 1
I'm not 100% sure this is the best fix, but it seems OK.
Brian Paul [Sat, 23 Jan 2010 01:35:36 +0000 (18:35 -0700)]
svga: fix up breakage from earlier 7.7 merge
Brian Paul [Sat, 23 Jan 2010 00:56:35 +0000 (17:56 -0700)]
st/mesa: fix incorrect freeing of drawpixels vertex shaders
These shaders are not st_vertex_shaders, but tgsi ureg shaders.
Fixes fd.o bug 25959.
Brian Paul [Sat, 23 Jan 2010 00:20:37 +0000 (17:20 -0700)]
gallium/util: add missing util/u_bitmask.c to Makefile
Brian Paul [Sat, 23 Jan 2010 00:17:01 +0000 (17:17 -0700)]
gallium/util: fix incorrect shift in a4r4g4b4_put_tile_rgba()
Fixes fd.o bug 23313.
Brian Paul [Fri, 22 Jan 2010 23:23:50 +0000 (16:23 -0700)]
mesa: use memcpy() in _mesa_ProgramEnv/LocalParameters4fvEXT()
Brian Paul [Fri, 22 Jan 2010 23:18:56 +0000 (16:18 -0700)]
mesa: use switch in _mesa_DeletePrograms()
Brian Paul [Fri, 22 Jan 2010 23:09:03 +0000 (16:09 -0700)]
Merge branch 'mesa_7_7_branch'
Conflicts:
src/mesa/shader/prog_execute.c
Brian Paul [Fri, 22 Jan 2010 22:41:08 +0000 (15:41 -0700)]
mesa: re-implement _mesa_ProgramEnvParameter4fvARB() with memcpy()
This is faster and ensures that NaN floats get stored properly.
Before, NaN values (which might be used with UP2H, UP2US, UP4B and
UP4UB) weren't getting stored properly with gcc -O3.
This is the second part of the fix for the piglit fp-unpack-01 failure
(bug 25973).
Brian Paul [Fri, 22 Jan 2010 22:36:28 +0000 (15:36 -0700)]
mesa: use new fetch_vector1ui() function for 'unpack' GPU instructions
The UP2H, UP2US, UP4B and UP4UB instructions interpret the float
registers as integers. With gcc -O3 some bits were getting mixed up
somewhere. This is part of the fix for the piglit fp-unpack-01 test
failure (bug 25973).