OSDN Git Service
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.
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 ;-)
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
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.
Dave Airlie [Sat, 23 Jan 2010 10:07:08 +0000 (20:07 +1000)]
r300: fix wrong call in last commit
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>
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 [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).
Brian Paul [Fri, 22 Jan 2010 20:07:04 +0000 (13:07 -0700)]
xlib/softpipe: more buffer free fixes
The previous memory leak fix didn't always work properly.
Now check the xm_buffer::smh field (now documented!) to
see if the buffer points to shared memory.
Alan Hourihane [Fri, 22 Jan 2010 19:32:12 +0000 (19:32 +0000)]
Remove obsolete file
Brian Paul [Fri, 22 Jan 2010 19:27:25 +0000 (12:27 -0700)]
gallium/aux: re-add pb_buffer_fenced.[ch] accidentally remove during merge
Brian Paul [Fri, 22 Jan 2010 19:17:02 +0000 (12:17 -0700)]
Merge branch 'mesa_7_7_branch'
Conflicts:
src/gallium/auxiliary/draw/draw_context.c
src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline.c
src/gallium/auxiliary/pipebuffer/Makefile
src/gallium/auxiliary/pipebuffer/SConscript
src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
src/gallium/auxiliary/tgsi/tgsi_scan.c
src/gallium/drivers/i915/i915_surface.c
src/gallium/drivers/i915/i915_texture.c
src/gallium/drivers/llvmpipe/lp_setup.c
src/gallium/drivers/llvmpipe/lp_tex_sample_c.c
src/gallium/drivers/llvmpipe/lp_texture.c
src/gallium/drivers/softpipe/sp_prim_vbuf.c
src/gallium/state_trackers/xorg/xorg_dri2.c
src/gallium/winsys/drm/intel/gem/intel_drm_api.c
src/gallium/winsys/drm/nouveau/drm/nouveau_drm_api.c
src/gallium/winsys/drm/radeon/core/radeon_drm.c
src/gallium/winsys/drm/vmware/core/vmw_screen_dri.c
src/mesa/state_tracker/st_cb_clear.c
Brian Paul [Fri, 22 Jan 2010 18:45:40 +0000 (11:45 -0700)]
gallium/draw: apply DRAW_PIPE_FLAG_MASK to all vertex elements
Depending on first/last provoking vertex either the first or last
element/index may have the extra DRAW_PIPE_x flags. Mask off those
bits for all vertex elements to be safe (esp. for the quad case).
This may be overly cautious, but it's a cheap operation.
Fixes a segfault caused by large/bogus vertex indexes otherwise.
Brian Paul [Fri, 22 Jan 2010 18:39:19 +0000 (11:39 -0700)]
gallium/draw: added comments, whitespace fixes
Alan Coopersmith [Fri, 22 Jan 2010 17:38:06 +0000 (10:38 -0700)]
mesa: Add "shader/" path to #include statements in shader parser/lexer sources
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Note sure why the compiler's -I paths aren't doing the job, but this is OK.
Signed-off-by: Brian Paul <brianp@vmware.com>
Brian Paul [Fri, 22 Jan 2010 16:35:12 +0000 (09:35 -0700)]
glapi: clean-up and simplify glapi_nop.c code
Removed _glapi_noop_enable_warnings() and _glapi_set_warning_func().
Just check the DEBUG env vars and call fprintf(stderr) with a warning
message instead.
Brian Paul [Fri, 22 Jan 2010 16:32:12 +0000 (09:32 -0700)]
glapi: split the no-op dispatch code into new glapi_nop.c file
This unclutters the glapi.c file a bit.
Brian Paul [Fri, 22 Jan 2010 15:15:14 +0000 (08:15 -0700)]
glapi: fix int->pointer conversions warnings in no-op functions
Brian Paul [Thu, 21 Jan 2010 20:46:53 +0000 (13:46 -0700)]
progs/xdemos: add z/Z keys for scaling the rendering
Brian Paul [Thu, 21 Jan 2010 20:08:21 +0000 (13:08 -0700)]
gallium/draw: fix-up comments, whitespace
Brian Paul [Thu, 21 Jan 2010 20:02:56 +0000 (13:02 -0700)]
gallium/draw: replace int with boolean
Ruediger Oertel [Fri, 22 Jan 2010 14:53:27 +0000 (06:53 -0800)]
Fix PowerPC related typo in spantmp2.h
Signed-off-by: Matthias Hopf <mhopf@suse.de>
Signed-off-by: Brian Paul <brianp@vmware.com>
Andre Maasikas [Fri, 22 Jan 2010 14:55:47 +0000 (16:55 +0200)]
r600: enable sampler lod* bits
bits, settings derived from testing, might contain some errors...
Andre Maasikas [Fri, 22 Jan 2010 12:06:10 +0000 (14:06 +0200)]
r600: update vport z & clipping when depth_clamp is changed
fixes piglit depth_clamp
Andre Maasikas [Fri, 22 Jan 2010 11:47:31 +0000 (13:47 +0200)]
r600: fix brownbag, only align if we are dealing with cubemap
Andre Maasikas [Fri, 22 Jan 2010 11:32:04 +0000 (13:32 +0200)]
r600: cubemap levels seem to be aligned to 8 images
Andre Maasikas [Fri, 22 Jan 2010 10:57:01 +0000 (12:57 +0200)]
radeon/fbo: flush rendering before generating mipmaps
or maybe should flush(also) in finish_render_texture...
Andre Maasikas [Mon, 4 Jan 2010 07:26:46 +0000 (09:26 +0200)]
radeon/fbo: use correct depth texture offset for depth textures
Andre Maasikas [Fri, 22 Jan 2010 10:31:24 +0000 (12:31 +0200)]
r600: enable draw_offset
fixes some fbo cases (mipmaps, cube textures ..)
Chia-I Wu [Fri, 22 Jan 2010 09:10:28 +0000 (17:10 +0800)]
docs: Update sourcetree.html for EGL and the state trackers.
Chia-I Wu [Fri, 22 Jan 2010 08:31:43 +0000 (16:31 +0800)]
st/egl_g3d: Rename to st/egl.
Simply the name to egl.
Chia-I Wu [Fri, 22 Jan 2010 08:25:11 +0000 (16:25 +0800)]
winsys/drm: Update the options of mklib in Makefile.egl_g3d.
Pass -linker, -ldflags, and $(MKLIB_OPTIONS) to mklib.
Chia-I Wu [Fri, 22 Jan 2010 08:02:39 +0000 (16:02 +0800)]
egl: Remove egl_softpipe.
With the addition egl_x11_swrast, egl_softpipe is sort of deprecated.
The new driver serves the same purpose as egl_softpipe does. It is
based on egl_g3d and provides more features.
Chia-I Wu [Fri, 22 Jan 2010 07:51:51 +0000 (15:51 +0800)]
winsys/drm: Add swrast.
The swrast winsys always returns NULL when drm_api_create is called.
José Fonseca [Fri, 22 Jan 2010 05:18:25 +0000 (21:18 -0800)]
vmware/core: Update for pipebuffer changes.
In particular, delay patching GMR relocations until the buffers are
validated, since the buffers relative offset can only be established then.
Vinson Lee [Fri, 22 Jan 2010 07:41:57 +0000 (23:41 -0800)]
st/mesa: Remove unnecessary header from st_cb_viewport.c.
Chia-I Wu [Fri, 22 Jan 2010 07:18:45 +0000 (15:18 +0800)]
st/egl: Remove the egl state tracker.
The egl_g3d state tracker has support for KMS, and the support is based
on the egl state tracker. As egl_g3d provides more features, it should
be better to keep only egl_g3d to unify the efforts.
Vinson Lee [Fri, 22 Jan 2010 07:24:40 +0000 (23:24 -0800)]
progs/trivial: Remove unnecessary header from tri-fbo-tex-mip.c.
Chia-I Wu [Fri, 22 Jan 2010 07:12:19 +0000 (15:12 +0800)]
egl: Remove USING_EGL and the related drivers.
They do not build for a long while and there seems to be no active
users. It might be better for them to live in the git histroy.
Chia-I Wu [Fri, 22 Jan 2010 07:07:58 +0000 (15:07 +0800)]
egl: Remove the demo driver.
The demo driver has outdated. It is suggested to look at any of the
drivers that is functioning.
Vinson Lee [Fri, 22 Jan 2010 07:09:06 +0000 (23:09 -0800)]
i915g: Remove unnecessary header.
Vinson Lee [Fri, 22 Jan 2010 07:07:29 +0000 (23:07 -0800)]
pipebuffer: Remove unnecessary header.
Chia-I Wu [Fri, 22 Jan 2010 06:41:00 +0000 (14:41 +0800)]
st/egl_g3d: Use glxinit.c from egl_xdri.
It is used to fetch the GLX visuals/fbconfigs. Use egl_xdri's version
to avoid duplication. It might be better to rewrite that part though.
Chia-I Wu [Fri, 22 Jan 2010 07:05:31 +0000 (15:05 +0800)]
docs: Update the status of egl_xdri.
Mention that it also supports DRISW.
Chia-I Wu [Fri, 22 Jan 2010 06:15:14 +0000 (14:15 +0800)]
egl_xdri: Add support for DRISW.
Try DRISW if both DRI2 and DRI fail. It can also be forced by setting
EGL_SOFTWARE. When DRISW is used, single-buffered modes are ignored.
Vinson Lee [Fri, 22 Jan 2010 06:57:12 +0000 (22:57 -0800)]
draw: Remove unnecessary headers.
Chia-I Wu [Fri, 22 Jan 2010 06:28:23 +0000 (14:28 +0800)]
egl_xdri: Flush commands on context switch and buffer swap.
The corresponding DRI functions does not flush for us.
Chia-I Wu [Fri, 22 Jan 2010 06:53:31 +0000 (14:53 +0800)]
egl_xdri: Report only OpenGL support.
It reported OpenGL ES support because some demos did not set
EGL_RENDERABLE_TYPE correctly. The demos are fixed.
Chia-I Wu [Fri, 22 Jan 2010 06:13:25 +0000 (14:13 +0800)]
egl_xdri: Do not reinitialize in __glXInitialize.
__glXInitialize should return the same GLX display for the same X
display. This issue is triggered by
a35f6bb207efe3c959bbd16a37f2049e5aceeea9.
Chia-I Wu [Fri, 22 Jan 2010 06:23:22 +0000 (14:23 +0800)]
egl_glx: Report only OpenGL support.
It reported OpenGL ES support because some demos did not set
EGL_RENDERABLE_TYPE correctly. The demos are fixed.
Chia-I Wu [Fri, 22 Jan 2010 05:29:10 +0000 (13:29 +0800)]
egl: Update driver Makefiles.
Update to use the new Makefile.template.
Chia-I Wu [Fri, 22 Jan 2010 04:02:00 +0000 (12:02 +0800)]
egl: Add Makefile.template for EGL drivers.
Chia-I Wu [Fri, 22 Jan 2010 03:11:48 +0000 (11:11 +0800)]
winsys/drm: Update Makefile.template.
Mainly to respect LDFLAGS and remove unused target $(LIBNAME_EGL). This
is based on the patch by Tomáš Chvátal <scarabeus@gentoo.org>.
Vinson Lee [Fri, 22 Jan 2010 01:24:07 +0000 (17:24 -0800)]
svga: Remove unused variable.
Alan Coopersmith [Fri, 22 Jan 2010 00:42:58 +0000 (16:42 -0800)]
Fix typo in configure message for gcc -fvisibility=hidden
Need to use $CC for a shell variable, not $(CC) for a make variable
which the shell interprets as running the command "CC".
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
José Fonseca [Thu, 21 Jan 2010 23:51:37 +0000 (15:51 -0800)]
vmware/core: Flush preemptively the FIFO commands to keep the GMR working set within reasonable bounds.
José Fonseca [Thu, 21 Jan 2010 23:47:52 +0000 (15:47 -0800)]
vmware/core: Put GMR pool size in a define.
José Fonseca [Thu, 21 Jan 2010 23:27:26 +0000 (15:27 -0800)]
vmw/wgl: Update for pipebuffer changes.
This is a minimum change to keep things building and running minimally -- it
might cause applications to fail to allocate buffers due to out of
GMR memory.
A proper update will be commited later.
José Fonseca [Thu, 21 Jan 2010 20:12:47 +0000 (12:12 -0800)]
svga: Remove duplicate code.
José Fonseca [Thu, 21 Jan 2010 22:24:53 +0000 (14:24 -0800)]
svga: Remove unused code.
José Fonseca [Wed, 20 Jan 2010 11:45:17 +0000 (03:45 -0800)]
svga: Don't swap buffers to system memory -- winsys' responsibility.
José Fonseca [Thu, 21 Jan 2010 20:43:40 +0000 (12:43 -0800)]
pipebuffer: Release the lock during map wait. Cleanups.
José Fonseca [Wed, 20 Jan 2010 11:43:53 +0000 (03:43 -0800)]
pipebuffer: Swap buffers out to system memory when running out of memory.
José Fonseca [Thu, 21 Jan 2010 20:13:27 +0000 (12:13 -0800)]
svga: Avoid synchronization issues when doing SW TNL.
José Fonseca [Thu, 21 Jan 2010 17:42:05 +0000 (09:42 -0800)]
mesa: Use pipe_buffer_write_nooverlap where appropriate.
José Fonseca [Thu, 21 Jan 2010 17:38:47 +0000 (09:38 -0800)]
util: Set DISCARD & UNSYNCHRONIZED when uploading vertices sequentially.
José Fonseca [Thu, 21 Jan 2010 17:32:17 +0000 (09:32 -0800)]
util: Use pipe_buffer_write_nooverlap in blits / mipmap generation.
José Fonseca [Thu, 21 Jan 2010 17:30:22 +0000 (09:30 -0800)]
gallium: New inline to write buffers which avoids synchronization.
José Fonseca [Thu, 21 Jan 2010 17:19:25 +0000 (09:19 -0800)]
gallium: Set PIPE_BUFFER_USAGE_DISCARD flag in pipe_buffer_write.
José Fonseca [Thu, 21 Jan 2010 17:13:15 +0000 (09:13 -0800)]
gallium: Remove temporary hack for the absence of a discard flag.
PIPE_BUFFER_USAGE_DISCARD flag now exists.
José Fonseca [Thu, 21 Jan 2010 20:12:33 +0000 (12:12 -0800)]
svga: Follow buffer usage semantics properly.
It's necessary to download buffers from the host always, except if the
buffer is undefined, because:
- just PIPE_BUFFER_USAGE_CPU_WRITE doesn't guarantee all data is written
-- old contents may still pierce through
- PIPE_BUFFER_USAGE_DISCARD refers to a range, not the whole buffer, so
unless we track which parts have been modified and not we still need
to download the data.
Vinson Lee [Thu, 21 Jan 2010 23:05:21 +0000 (15:05 -0800)]
st/xorg: Remove unnecessary headers.
Roland Scheidegger [Thu, 21 Jan 2010 22:30:16 +0000 (17:30 -0500)]
r200: fix CS section size mismatch
Partial fix for fdo bug 25544
The tex handling will still need CS drm changes,
see bug 25544 for more.
Vinson Lee [Thu, 21 Jan 2010 22:31:15 +0000 (14:31 -0800)]
llvmpipe: Remove unnecessary headers.
Vinson Lee [Thu, 21 Jan 2010 20:12:11 +0000 (12:12 -0800)]
svga: Remove unnecessary headers.
Brian Paul [Thu, 21 Jan 2010 18:52:54 +0000 (11:52 -0700)]
gallium: fix conditional rendering comment
Brian Paul [Thu, 21 Jan 2010 18:52:36 +0000 (11:52 -0700)]
gallium/docs: document conditional rendering
Brian Paul [Thu, 21 Jan 2010 18:35:33 +0000 (11:35 -0700)]
gallium: updated comments, whitespace fixes
Brian Paul [Thu, 21 Jan 2010 16:44:42 +0000 (09:44 -0700)]
mesa: minor whitespace fix
Luca Barbieri [Thu, 21 Jan 2010 06:38:39 +0000 (22:38 -0800)]
mesa: support for GL_ARB_fragment_coord_conventions
Signed-off-by: Brian Paul <brianp@vmware.com>