mesa.git
13 years agomesa: Convert texture debug dump function to using MapTextureImage().
Brian Paul [Mon, 1 Aug 2011 03:14:54 +0000 (20:14 -0700)]
mesa: Convert texture debug dump function to using MapTextureImage().

Reviewed-by: Brian Paul <brianp@vmware.com>
13 years agointel: Remove our custom _mesa_store_compressed_texsubimage2d().
Eric Anholt [Fri, 29 Jul 2011 23:40:29 +0000 (16:40 -0700)]
intel: Remove our custom _mesa_store_compressed_texsubimage2d().

Now that Mesa core knows how to map teximages, we no longer needed the
compressed paths here.

Reviewed-by: Brian Paul <brianp@vmware.com>
13 years agomesa: Convert texstore.c to accessing textures using MapTextureImage.
Brian Paul [Fri, 29 Jul 2011 23:25:23 +0000 (16:25 -0700)]
mesa: Convert texstore.c to accessing textures using MapTextureImage.

This continues to allocate texImage->Data as before, so
drivers calling these functions need to use that when present.

Reviewed-by: Brian Paul <brianp@vmware.com>
13 years agonouveau: Add MapTextureImage() implementation.
Eric Anholt [Mon, 15 Aug 2011 17:20:25 +0000 (10:20 -0700)]
nouveau: Add MapTextureImage() implementation.

This is untested, but should be close to working since it's basically
a copy of nouveau_teximage_map().

Reviewed-by: Brian Paul <brianp@vmware.com>
13 years agoradeon: Add MapTextureImage() implementation.
Eric Anholt [Mon, 1 Aug 2011 15:43:07 +0000 (08:43 -0700)]
radeon: Add MapTextureImage() implementation.

Reviewed-by: Brian Paul <brianp@vmware.com>
13 years agoradeon: Refactor the common texture hook setup to common code.
Eric Anholt [Mon, 1 Aug 2011 15:46:47 +0000 (08:46 -0700)]
radeon: Refactor the common texture hook setup to common code.

Reviewed-by: Brian Paul <brianp@vmware.com>
13 years agoswrast: Add implementation of MapTextureImage/UnmapTextureImage.
Brian Paul [Fri, 29 Jul 2011 22:30:21 +0000 (15:30 -0700)]
swrast: Add implementation of MapTextureImage/UnmapTextureImage.

Reviewed-by: Brian Paul <brianp@vmware.com>
13 years agointel: Add implementation of MapTextureImage/UnmapTextureImage.
Eric Anholt [Fri, 29 Jul 2011 21:35:01 +0000 (14:35 -0700)]
intel: Add implementation of MapTextureImage/UnmapTextureImage.

Reviewed-by: Brian Paul <brianp@vmware.com>
13 years agost/mesa: Add implementation of MapTextureImage.
Brian Paul [Sat, 30 Jul 2011 00:25:38 +0000 (17:25 -0700)]
st/mesa: Add implementation of MapTextureImage.

Reviewed-by: Brian Paul <brianp@vmware.com>
13 years agomesa: Add driver hooks for texture image mapping/unmapping.
Brian Paul [Fri, 15 Jul 2011 02:57:34 +0000 (20:57 -0600)]
mesa: Add driver hooks for texture image mapping/unmapping.

ctx->Driver.MapTextureImage() / UnmapTextureImage() will be called by
the glTex[Sub]Image(), glGetTexImage() functions, etc. when we're
accessing texture data, and also for software rendering when accessing
texture data.

Reviewed-by: Brian Paul <brianp@vmware.com>
13 years agomesa: Don't check for image->Data when freeing an image's contents.
Eric Anholt [Wed, 27 Jul 2011 21:40:08 +0000 (14:40 -0700)]
mesa: Don't check for image->Data when freeing an image's contents.

All driver implementations of FreeTextureImageBuffer already check
that Data != NULL and free it.  However, this means that we will also
free driver storage if the driver storage wasn't in the form of a Data
pointer.

This was produced by the following semantic patch:

@@
expression C;
expression T;
@@
- if (T->Data) {
- C->Driver.FreeTextureImageBuffer(C, T);
+ C->Driver.FreeTextureImageBuffer(C, T);
- }

Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
13 years agoRename some driver FreeTextureImageData functions to FreeTextureImageBuffer.
Eric Anholt [Wed, 27 Jul 2011 19:56:07 +0000 (12:56 -0700)]
Rename some driver FreeTextureImageData functions to FreeTextureImageBuffer.

Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
13 years agomesa: Rename FreeTexImageData to FreeTextureImageBuffer.
Eric Anholt [Wed, 27 Jul 2011 19:29:48 +0000 (12:29 -0700)]
mesa: Rename FreeTexImageData to FreeTextureImageBuffer.

This was produced by sed, except for one hunk in driverfuncs.c where
trailing whitespace was dropped.

Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
13 years agoi915g: remove unused var in i915_flush_heuristically()
Brian Paul [Mon, 29 Aug 2011 14:11:50 +0000 (08:11 -0600)]
i915g: remove unused var in i915_flush_heuristically()

13 years agowinsys/g3dvl: Fix include style
Kai Wasserbäch [Sat, 27 Aug 2011 15:51:59 +0000 (17:51 +0200)]
winsys/g3dvl: Fix include style

As explained in the thread starting at [0], the internal include style
should be »#include "path/to/header.h"« for non-system includes.

[0]
<http://news.gmane.org/find-root.php?message_id=%3c4E5802BE.6020206%40vmware.com%3e>

Signed-off-by: Kai Wasserbäch <kai@dev.carbon-project.org>
Signed-off-by: Brian Paul <brianp@vmware.com>
13 years agotests/unit: Fix include style
Kai Wasserbäch [Sat, 27 Aug 2011 15:51:58 +0000 (17:51 +0200)]
tests/unit: Fix include style

As explained in the thread starting at [0], the internal include style
should be »#include "path/to/header.h"« for non-system includes.

[0]
<http://news.gmane.org/find-root.php?message_id=%3c4E5802BE.6020206%40vmware.com%3e>

Signed-off-by: Kai Wasserbäch <kai@dev.carbon-project.org>
Signed-off-by: Brian Paul <brianp@vmware.com>
13 years agotargets/xorg-vmwgfx: Fix include style
Kai Wasserbäch [Sat, 27 Aug 2011 15:51:57 +0000 (17:51 +0200)]
targets/xorg-vmwgfx: Fix include style

As explained in the thread starting at [0], the internal include style
should be »#include "path/to/header.h"« for non-system includes.

[0]
<http://news.gmane.org/find-root.php?message_id=%3c4E5802BE.6020206%40vmware.com%3e>

Signed-off-by: Kai Wasserbäch <kai@dev.carbon-project.org>
Signed-off-by: Brian Paul <brianp@vmware.com>
13 years agost/xorg: Fix include style
Kai Wasserbäch [Sat, 27 Aug 2011 15:51:56 +0000 (17:51 +0200)]
st/xorg: Fix include style

As explained in the thread starting at [0], the internal include style
should be »#include "path/to/header.h"« for non-system includes.

[0]
<http://news.gmane.org/find-root.php?message_id=%3c4E5802BE.6020206%40vmware.com%3e>

Signed-off-by: Kai Wasserbäch <kai@dev.carbon-project.org>
Signed-off-by: Brian Paul <brianp@vmware.com>
13 years agovdpau: Fix include style
Kai Wasserbäch [Sat, 27 Aug 2011 15:51:55 +0000 (17:51 +0200)]
vdpau: Fix include style

As explained in the thread starting at [0], the internal include style
should be »#include "path/to/header.h"« for non-system includes.

[0]
<http://news.gmane.org/find-root.php?message_id=%3c4E5802BE.6020206%40vmware.com%3e>

Signed-off-by: Kai Wasserbäch <kai@dev.carbon-project.org>
Signed-off-by: Brian Paul <brianp@vmware.com>
13 years agova: Fix include style
Kai Wasserbäch [Sat, 27 Aug 2011 15:51:54 +0000 (17:51 +0200)]
va: Fix include style

As explained in the thread starting at [0], the internal include style
should be »#include "path/to/header.h"« for non-system includes.

[0]
<http://news.gmane.org/find-root.php?message_id=%3c4E5802BE.6020206%40vmware.com%3e>

Signed-off-by: Kai Wasserbäch <kai@dev.carbon-project.org>
Signed-off-by: Brian Paul <brianp@vmware.com>
13 years agod3d1x: Fix include style
Kai Wasserbäch [Sat, 27 Aug 2011 15:51:53 +0000 (17:51 +0200)]
d3d1x: Fix include style

As explained in the thread starting at [0], the internal include style
should be »#include "path/to/header.h"« for non-system includes.

[0]
<http://news.gmane.org/find-root.php?message_id=%3c4E5802BE.6020206%40vmware.com%3e>

Signed-off-by: Kai Wasserbäch <kai@dev.carbon-project.org>
Signed-off-by: Brian Paul <brianp@vmware.com>
13 years agoinclude/pipe: Fix include style
Kai Wasserbäch [Sat, 27 Aug 2011 15:51:52 +0000 (17:51 +0200)]
include/pipe: Fix include style

As explained in the thread starting at [0], the internal include style
should be »#include "path/to/header.h"« for non-system includes.

[0]
<http://news.gmane.org/find-root.php?message_id=%3c4E5802BE.6020206%40vmware.com%3e>

Signed-off-by: Kai Wasserbäch <kai@dev.carbon-project.org>
Signed-off-by: Brian Paul <brianp@vmware.com>
13 years agor600g: Fix include style
Kai Wasserbäch [Sat, 27 Aug 2011 15:51:51 +0000 (17:51 +0200)]
r600g: Fix include style

As explained in the thread starting at [0], the internal include style
should be »#include "path/to/header.h"« for non-system includes.

[0]
<http://news.gmane.org/find-root.php?message_id=%3c4E5802BE.6020206%40vmware.com%3e>

Signed-off-by: Kai Wasserbäch <kai@dev.carbon-project.org>
Signed-off-by: Brian Paul <brianp@vmware.com>
13 years agonoop: Fix include style
Kai Wasserbäch [Sat, 27 Aug 2011 15:51:50 +0000 (17:51 +0200)]
noop: Fix include style

As explained in the thread starting at [0], the internal include style
should be »#include "path/to/header.h"« for non-system includes.

[0]
<http://news.gmane.org/find-root.php?message_id=%3c4E5802BE.6020206%40vmware.com%3e>

Signed-off-by: Kai Wasserbäch <kai@dev.carbon-project.org>
Signed-off-by: Brian Paul <brianp@vmware.com>
13 years agovl: Fix include style
Kai Wasserbäch [Sat, 27 Aug 2011 15:51:49 +0000 (17:51 +0200)]
vl: Fix include style

As explained in the thread starting at [0], the internal include style
should be »#include "path/to/header.h"« for non-system includes.

[0]
<http://news.gmane.org/find-root.php?message_id=%3c4E5802BE.6020206%40vmware.com%3e>

Signed-off-by: Kai Wasserbäch <kai@dev.carbon-project.org>
Signed-off-by: Brian Paul <brianp@vmware.com>
13 years agoutil: Fix include style
Kai Wasserbäch [Sat, 27 Aug 2011 15:51:48 +0000 (17:51 +0200)]
util: Fix include style

As explained in the thread starting at [0], the internal include style
should be »#include "path/to/header.h"« for non-system includes.

[0]
<http://news.gmane.org/find-root.php?message_id=%3c4E5802BE.6020206%40vmware.com%3e>

Signed-off-by: Kai Wasserbäch <kai@dev.carbon-project.org>
Signed-off-by: Brian Paul <brianp@vmware.com>
13 years agodocs: Fix minor typos.
Kai Wasserbäch [Sat, 27 Aug 2011 15:51:47 +0000 (17:51 +0200)]
docs: Fix minor typos.

dbec3a5d introduced minor typos, this should fix them.

Signed-off-by: Kai Wasserbäch <kai@dev.carbon-project.org>
Signed-off-by: Brian Paul <brianp@vmware.com>
13 years agog3dvl: Fix a bug not decoding the last 32-64 bits of an mpeg2 bitstream.
Christian König [Mon, 29 Aug 2011 08:36:06 +0000 (10:36 +0200)]
g3dvl: Fix a bug not decoding the last 32-64 bits of an mpeg2 bitstream.

Another bug found by Andy Furniss.

13 years agost/vdpau: Respect source_rect in VideoMixerRender
Christian König [Sun, 28 Aug 2011 11:52:44 +0000 (13:52 +0200)]
st/vdpau: Respect source_rect in VideoMixerRender

Fixing a bug reported by Andy Furniss.

13 years agoegl: Use gbm/wayland flags regardless of egl_dri2
Benjamin Franzke [Mon, 29 Aug 2011 07:21:30 +0000 (09:21 +0200)]
egl: Use gbm/wayland flags regardless of egl_dri2

Since they are needed for display autodetection.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=40443

13 years agoxvmc tests: Clean up test_rendering slightly
Maarten Lankhorst [Sat, 27 Aug 2011 23:56:30 +0000 (01:56 +0200)]
xvmc tests: Clean up test_rendering slightly

Signed-off-by: Maarten Lankhorst <m.b.lankhorst@gmail.com>
13 years agoandroid: add support for egl_dri2
Chia-I Wu [Fri, 19 Aug 2011 09:11:34 +0000 (17:11 +0800)]
android: add support for egl_dri2

Add rules to build egl_dri2 and make it a built-in EGL driver of
libGLES_mesa.

Reviewed-by: Chad Versace <chad@chad-versace.us>
13 years agoegl_dri2: add support for Android
Chia-I Wu [Fri, 5 Aug 2011 05:39:18 +0000 (14:39 +0900)]
egl_dri2: add support for Android

Add platform_android.c that supports _EGL_PLAFORM_ANDROID.  It works
with drm_gralloc, where back buffers of windows are backed by GEM
objects.

In Android a native window has a queue of back buffers allocated by the
server, through drm_gralloc.  For each frame, EGL needs to

  dequeue the next back buffer
  render to the buffer
  enqueue the buffer

After enqueuing, the buffer is no longer valid to EGL.  A window has no
depth buffer or other aux buffers.  They need to be allocated locally by
EGL.

Reviewed-by: Benjamin Franzke <benjaminfranzke@googlemail.com>
Reviewed-by: Chad Versace <chad@chad-versace.us>
[olv: with assorted minor changes, mostly suggested during the review]

13 years agoegl_dri2: allow RGBA masks to be specified for matching
Chia-I Wu [Fri, 5 Aug 2011 05:36:14 +0000 (14:36 +0900)]
egl_dri2: allow RGBA masks to be specified for matching

Add rgba_masks to dri2_add_config.  When it is non-NULL, the DRI config
is accepted only when the offsets and sizes of the its channels match
rgba_mask.

Reviewed-by: Chad Versace <chad@chad-versace.us>
13 years agoglsl_to_tgsi: remove unused code
Marek Olšák [Wed, 24 Aug 2011 21:58:43 +0000 (23:58 +0200)]
glsl_to_tgsi: remove unused code

13 years agoandroid: make DRM optional
Chia-I Wu [Thu, 25 Aug 2011 13:36:19 +0000 (21:36 +0800)]
android: make DRM optional

For BOARD_GPU_DRIVERS=swrast build, DRM is not needed.

13 years agoandroid: add support for nouveau
Chia-I Wu [Mon, 22 Aug 2011 03:21:31 +0000 (11:21 +0800)]
android: add support for nouveau

Compile tested only.

13 years agoandroid: add support for r300g
Chia-I Wu [Mon, 22 Aug 2011 02:45:29 +0000 (10:45 +0800)]
android: add support for r300g

Compile tested only.

13 years agoandroid: add support for i915g
Chia-I Wu [Mon, 22 Aug 2011 03:04:46 +0000 (11:04 +0800)]
android: add support for i915g

Quickly tested with 945GME.  SurfaceFlinger (the display server and
compositor) works.  2D apps with RGB or RGBA visuals work.  As for 3D
apps, some work and some do not.

13 years agoandroid: add support for vmwgfx
Chia-I Wu [Mon, 22 Aug 2011 03:14:33 +0000 (11:14 +0800)]
android: add support for vmwgfx

Quickly tested with VMWare Workstation 7.1.4 on Linux with GeForce
GT220.  SurfaceFlinger (the display server and compositor) works.  2D
apps with RGB visual works.  However, due to missing
PIPE_FORMAT_R8G8B8A8_UNORM support, those with RGBA visual do not.

13 years agowinsys/i915: share the source list
Chia-I Wu [Mon, 22 Aug 2011 03:09:20 +0000 (11:09 +0800)]
winsys/i915: share the source list

Factor out C_SOURCES from Makefile to Makefile.sources, and let Makefile
and SConscript share it.

13 years agowinsys/svga: share the source list
Chia-I Wu [Mon, 22 Aug 2011 03:18:15 +0000 (11:18 +0800)]
winsys/svga: share the source list

Factor out C_SOURCES from Makefile to Makefile.sources, and let Makefile
and SConscript share it.

13 years agonouveau: share the source lists
Chia-I Wu [Mon, 22 Aug 2011 03:30:27 +0000 (11:30 +0800)]
nouveau: share the source lists

For each driver, factor out C_SOURCES from Makefile to Makefile.sources,
and let Makefile and SConscript share it.

13 years agor300g: share the source list
Chia-I Wu [Mon, 22 Aug 2011 02:53:10 +0000 (10:53 +0800)]
r300g: share the source list

Factor out C_SOURCES from Makefile to Makefile.sources, and let Makefile
and SConscript share it.

Note that

  $(TOP)/src/glsl/ralloc.c and
  $(TOP)/src/mesa/program/register_allocate.c

are removed from C_SOURCES in Makefile.sources and added back in
Makefile and SConscript.  The idea is that they are not part of r300g.
But having them in libr300.a makes build non-GL targets such as the
compiler tests or g3dvl much easier.  Also, for practical reason, TOP
would be an undefined variable in Makefile.sources.

13 years agoi915g: share the source list
Chia-I Wu [Mon, 22 Aug 2011 03:07:26 +0000 (11:07 +0800)]
i915g: share the source list

Factor out C_SOURCES from Makefile to Makefile.sources, and let Makefile
and SConscript share it.

13 years agosvga: share the source list
Chia-I Wu [Mon, 22 Aug 2011 03:16:33 +0000 (11:16 +0800)]
svga: share the source list

Factor out C_SOURCES from Makefile to Makefile.sources, and let Makefile
and SConscript share it.

13 years agotargets/egl-static: fix nouveau and vmwgfx for Android
Chia-I Wu [Fri, 26 Aug 2011 03:30:47 +0000 (11:30 +0800)]
targets/egl-static: fix nouveau and vmwgfx for Android

drmVersion and driver specific ioctls are used to get the PCI ID from a
DRM fd.  Eexpand the mechanism to nouveau and vmwgfx, except that for
nouveau, only the vendor ID is needed, and for vmwgfx, always assume
SVGA II.

13 years agopci_ids: add vmwgfx pci id list
Chia-I Wu [Wed, 24 Aug 2011 05:48:25 +0000 (13:48 +0800)]
pci_ids: add vmwgfx pci id list

There is only one chipset

 15ad:0405 VMware SVGA II Adapter

13 years agomapi: Commit generated files modified by previous commit
Ian Romanick [Fri, 26 Aug 2011 00:31:03 +0000 (17:31 -0700)]
mapi: Commit generated files modified by previous commit

Some of the changes are spurious because somebody forgot to do this
when adding glFramebufferTextureLayerARB.

13 years agomapi: Silence many "warning: unused parameter"
Ian Romanick [Fri, 26 Aug 2011 00:27:08 +0000 (17:27 -0700)]
mapi: Silence many "warning: unused parameter"

When generating dispatch templates, emit the '(void) blah;' magic to
make GCC happy.  This reduces a lot of warning spam if you build with
-Wunused-parameter or -Wextra.

Reviewed-by: Chia-I Wu <olv@lunarg.com>
13 years agomesa/tnl_dd: Remove unused source tree mesa/tnl_dd/imm
Ian Romanick [Thu, 25 Aug 2011 20:54:46 +0000 (13:54 -0700)]
mesa/tnl_dd: Remove unused source tree mesa/tnl_dd/imm

Acked-by: Kristian Høgsberg <krh@bitplanet.net>
Acked-by: Marek Olšák <maraeo@gmail.com>
Acked-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Jakob Bornecrantz <jakob@vmware.com>
Acked-by: Dave Airlie <airlied@redhat.com>
Build-Tested-by: Jakob Bornecrantz <jakob@vmware.com>
Tested-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
13 years agomesa/tnl_dd: Remove unused header file t_dd_vbtmp.h
Ian Romanick [Thu, 25 Aug 2011 20:51:57 +0000 (13:51 -0700)]
mesa/tnl_dd: Remove unused header file t_dd_vbtmp.h

Acked-by: Kristian Høgsberg <krh@bitplanet.net>
Acked-by: Marek Olšák <maraeo@gmail.com>
Acked-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Jakob Bornecrantz <jakob@vmware.com>
Acked-by: Dave Airlie <airlied@redhat.com>
Build-Tested-by: Jakob Bornecrantz <jakob@vmware.com>
Tested-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
13 years agomesa/tnl_dd: Remove unused header file t_dd_rendertmp.h
Ian Romanick [Thu, 25 Aug 2011 20:45:02 +0000 (13:45 -0700)]
mesa/tnl_dd: Remove unused header file t_dd_rendertmp.h

Acked-by: Kristian Høgsberg <krh@bitplanet.net>
Acked-by: Marek Olšák <maraeo@gmail.com>
Acked-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Jakob Bornecrantz <jakob@vmware.com>
Acked-by: Dave Airlie <airlied@redhat.com>
Build-Tested-by: Jakob Bornecrantz <jakob@vmware.com>
Tested-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
13 years agomesa: Remove support for BeOS
Ian Romanick [Thu, 25 Aug 2011 15:25:09 +0000 (08:25 -0700)]
mesa: Remove support for BeOS

Acked-by: Kristian Høgsberg <krh@bitplanet.net>
Acked-by: Marek Olšák <maraeo@gmail.com>
Acked-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Jakob Bornecrantz <jakob@vmware.com>
Acked-by: Dave Airlie <airlied@redhat.com>
Build-Tested-by: Jakob Bornecrantz <jakob@vmware.com>
Tested-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
13 years agodri: Remove unused header files mmx.h and spantmp.h
Ian Romanick [Wed, 24 Aug 2011 23:18:43 +0000 (16:18 -0700)]
dri: Remove unused header files mmx.h and spantmp.h

These header files were only used by drivers removed in a previous commit.

Acked-by: Kristian Høgsberg <krh@bitplanet.net>
Acked-by: Marek Olšák <maraeo@gmail.com>
Acked-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Jakob Bornecrantz <jakob@vmware.com>
Acked-by: Dave Airlie <airlied@redhat.com>
Build-Tested-by: Jakob Bornecrantz <jakob@vmware.com>
Tested-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
13 years agodri: Remove driRenderbuffer::backBuffer field
Ian Romanick [Wed, 24 Aug 2011 22:40:49 +0000 (15:40 -0700)]
dri: Remove driRenderbuffer::backBuffer field

The tdfx driver was the only user.

Acked-by: Kristian Høgsberg <krh@bitplanet.net>
Acked-by: Marek Olšák <maraeo@gmail.com>
Acked-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Jakob Bornecrantz <jakob@vmware.com>
Acked-by: Dave Airlie <airlied@redhat.com>
Build-Tested-by: Jakob Bornecrantz <jakob@vmware.com>
Tested-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
13 years agodri: Remove all DRI1 drivers
Ian Romanick [Wed, 24 Aug 2011 22:21:58 +0000 (15:21 -0700)]
dri: Remove all DRI1 drivers

Acked-by: Kristian Høgsberg <krh@bitplanet.net>
Acked-by: Marek Olšák <maraeo@gmail.com>
Acked-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Jakob Bornecrantz <jakob@vmware.com>
Acked-by: Dave Airlie <airlied@redhat.com>
Build-Tested-by: Jakob Bornecrantz <jakob@vmware.com>
Tested-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
13 years agomesa: Remove obsolete Windows gldirect and ICD drivers
Ian Romanick [Wed, 24 Aug 2011 21:56:36 +0000 (14:56 -0700)]
mesa: Remove obsolete Windows gldirect and ICD drivers

Acked-by: Kristian Høgsberg <krh@bitplanet.net>
Acked-by: Marek Olšák <maraeo@gmail.com>
Acked-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Jakob Bornecrantz <jakob@vmware.com>
Acked-by: Dave Airlie <airlied@redhat.com>
Build-Tested-by: Jakob Bornecrantz <jakob@vmware.com>
Tested-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
13 years agomesa: Remove obsolete linux-fbdev software driver
Ian Romanick [Wed, 24 Aug 2011 21:50:12 +0000 (14:50 -0700)]
mesa: Remove obsolete linux-fbdev software driver

Acked-by: Kristian Høgsberg <krh@bitplanet.net>
Acked-by: Marek Olšák <maraeo@gmail.com>
Acked-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Jakob Bornecrantz <jakob@vmware.com>
Acked-by: Dave Airlie <airlied@redhat.com>
Build-Tested-by: Jakob Bornecrantz <jakob@vmware.com>
Tested-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
13 years agomesa: Remove stray, unused file
Ian Romanick [Wed, 24 Aug 2011 22:23:53 +0000 (15:23 -0700)]
mesa: Remove stray, unused file

Acked-by: Kristian Høgsberg <krh@bitplanet.net>
Acked-by: Marek Olšák <maraeo@gmail.com>
Acked-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Jakob Bornecrantz <jakob@vmware.com>
Acked-by: Dave Airlie <airlied@redhat.com>
Build-Tested-by: Jakob Bornecrantz <jakob@vmware.com>
Tested-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
13 years agoi965: Factor our source lists into Makefile.sources
Chad Versace [Fri, 26 Aug 2011 22:52:16 +0000 (15:52 -0700)]
i965: Factor our source lists into Makefile.sources

In preparation for porting i965 to Android, factor its source lists into
a shared makefile. This prevents duplication of source lists, and hence
prevents the Android from breaking as often.

Acked-by: Chia-I Wu <olv@lunarg.com>
Signed-off-by: Chad Versace <chad@chad-versace.us>
13 years agoMerge branch 'master' of git://anongit.freedesktop.org/mesa/mesa
Stéphane Marchesin [Sat, 27 Aug 2011 00:37:25 +0000 (17:37 -0700)]
Merge branch 'master' of git://anongit.freedesktop.org/mesa/mesa

13 years agog3dvl: use pointer_to_uintptr() to silence a cast warning
Brian Paul [Fri, 26 Aug 2011 20:16:20 +0000 (14:16 -0600)]
g3dvl: use pointer_to_uintptr() to silence a cast warning

13 years agodocs: Add a page on post-processing
Lauri Kasanen [Thu, 25 Aug 2011 20:26:17 +0000 (23:26 +0300)]
docs: Add a page on post-processing

With edits by Brian.

Signed-off-by: Lauri Kasanen <cand@gmx.com>
Signed-off-by: Brian Paul <brianp@vmware.com>
13 years agosvga: include LLVM in name string in debug builds
Brian Paul [Fri, 26 Aug 2011 19:56:39 +0000 (13:56 -0600)]
svga: include LLVM in name string in debug builds

13 years agopp: initialize the sample mask
Christoph Bumiller [Fri, 26 Aug 2011 19:45:26 +0000 (21:45 +0200)]
pp: initialize the sample mask

We cannot rely on pipe drivers to default to non-zero.

Fixes pp being a no-op on nv50.

Reviewed-by: Lauri Kasanen <cand@gmx.com>
13 years agost/xorg: Fix solid fills for formats other than PICT_a8r8g8b8.
Michel Dänzer [Tue, 23 Aug 2011 16:07:51 +0000 (18:07 +0200)]
st/xorg: Fix solid fills for formats other than PICT_a8r8g8b8.

Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
13 years agor600g: Hook up xorg state tracker.
Michel Dänzer [Mon, 22 Aug 2011 13:44:42 +0000 (15:44 +0200)]
r600g: Hook up xorg state tracker.

Mostly copied from r300g.

Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
13 years agor600g: Handle PIPE_TRANSFER_MAP_DIRECTLY.
Michel Dänzer [Mon, 22 Aug 2011 13:44:43 +0000 (15:44 +0200)]
r600g: Handle PIPE_TRANSFER_MAP_DIRECTLY.

If the state tracker tries to map the resource directly but we can't or don't
want to do that, fail to create a transfer.

Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
13 years agost/xorg: Disable dirty throttling by default.
Michel Dänzer [Mon, 22 Aug 2011 13:44:42 +0000 (15:44 +0200)]
st/xorg: Disable dirty throttling by default.

Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
13 years agost/xorg: Only damage non-front source in DRI2 CopyRegion hook.
Michel Dänzer [Mon, 22 Aug 2011 13:44:42 +0000 (15:44 +0200)]
st/xorg: Only damage non-front source in DRI2 CopyRegion hook.

Based on a vmwgfx xa/saa fix.

Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
13 years agog3dvl: s/inline/INLINE/ to fix MSVC build
Brian Paul [Fri, 26 Aug 2011 14:24:01 +0000 (08:24 -0600)]
g3dvl: s/inline/INLINE/ to fix MSVC build

13 years agog3dvl: fix compilation failure on MSVC
Brian Paul [Fri, 26 Aug 2011 14:10:24 +0000 (08:10 -0600)]
g3dvl: fix compilation failure on MSVC

I assume the intention of "mb = {}" was to zero-initialize it.

13 years agoscons: don't compile some files with -gstabs if using mingw32
Brian Paul [Thu, 25 Aug 2011 22:50:56 +0000 (16:50 -0600)]
scons: don't compile some files with -gstabs if using mingw32

Compiling some (large) files with i686-pc-mingw32-gcc 4.2.2 (at least)
and the -gstabs option triggers a compiler error.  Use this work-around
to simply compile the effected files without -gstabs.

13 years agoscons: add more LIBS for compiling with LLVM 2.9 on Windows
Brian Paul [Thu, 25 Aug 2011 21:14:37 +0000 (15:14 -0600)]
scons: add more LIBS for compiling with LLVM 2.9 on Windows

These extra libs shouldn't hurt with LLVM 2.8 or older.

13 years agog3dvl: Rewrite the mpeg 1&2 bitstream parser
Christian König [Wed, 24 Aug 2011 20:51:31 +0000 (22:51 +0200)]
g3dvl: Rewrite the mpeg 1&2 bitstream parser

Based on work of Maarten Lankhorst this time.

Signed-off-by: Christian König <deathsimple@vodafone.de>
Reviewed-by: Younes Manton <younes.m@gmail.com>
13 years agog3dvl: Use a single texture for luma and chroma data
Christian König [Wed, 24 Aug 2011 20:10:42 +0000 (22:10 +0200)]
g3dvl: Use a single texture for luma and chroma data

Signed-off-by: Christian König <deathsimple@vodafone.de>
Reviewed-by: Younes Manton <younes.m@gmail.com>
13 years agog3dvl: Rework the decoder interface part 5/5
Christian König [Fri, 12 Aug 2011 11:29:00 +0000 (13:29 +0200)]
g3dvl: Rework the decoder interface part 5/5

Make setting the quant matrixes a generic interface.
Also removes setting the quant matrix from the XvMC interface

Signed-off-by: Christian König <deathsimple@vodafone.de>
Reviewed-by: Younes Manton <younes.m@gmail.com>
13 years agog3dvl: Rework the decoder interface part 4/5
Christian König [Thu, 11 Aug 2011 14:11:36 +0000 (16:11 +0200)]
g3dvl: Rework the decoder interface part 4/5

Make the picture_structure enum spec complient.
Also remove it from the compositor.

Signed-off-by: Christian König <deathsimple@vodafone.de>
Reviewed-by: Younes Manton <younes.m@gmail.com>
13 years agog3dvl: Rework the decoder interface part 3/5
Christian König [Wed, 10 Aug 2011 16:07:01 +0000 (18:07 +0200)]
g3dvl: Rework the decoder interface part 3/5

Revert back to a macroblock based interface. The structure used
tries to keep as close to the spec as possible.

Signed-off-by: Christian König <deathsimple@vodafone.de>
Reviewed-by: Younes Manton <younes.m@gmail.com>
13 years agog3dvl: Rework the decoder interface part 2/5
Christian König [Tue, 9 Aug 2011 17:27:57 +0000 (19:27 +0200)]
g3dvl: Rework the decoder interface part 2/5

Implement PIPE_CAP_NUM_BUFFERS_DESIRED giving the decoder control over
the number of buffers a state tracker should allocate.

Signed-off-by: Christian König <deathsimple@vodafone.de>
Reviewed-by: Younes Manton <younes.m@gmail.com>
13 years agog3dvl: Rework the decoder interface part 1/5
Christian König [Tue, 9 Aug 2011 16:45:13 +0000 (18:45 +0200)]
g3dvl: Rework the decoder interface part 1/5

First of all get ride of the decode_buffer structure, while still giving
the decoder the ability to organize it's buffers depending on the needs
of the state tracker.

Signed-off-by: Christian König <deathsimple@vodafone.de>
Reviewed-by: Younes Manton <younes.m@gmail.com>
13 years agotgsi: update tgsi.rst for TXQ
Dave Airlie [Thu, 25 Aug 2011 12:03:19 +0000 (13:03 +0100)]
tgsi: update tgsi.rst for TXQ

add some info on the TXQ opcode.

Signed-off-by: Dave Airlie <airlied@redhat.com>
13 years agoi915g: Fix off-by-one in scissors.
David Reveman [Wed, 24 Aug 2011 01:49:11 +0000 (18:49 -0700)]
i915g: Fix off-by-one in scissors.

13 years agoi915g: Fix case where texcoords can overlap with fragpos/frontface.
Stéphane Marchesin [Wed, 24 Aug 2011 01:47:24 +0000 (18:47 -0700)]
i915g: Fix case where texcoords can overlap with fragpos/frontface.

13 years agoi915g: Improve the flush heuristic by using the previous frame's number of vertices.
Stéphane Marchesin [Wed, 24 Aug 2011 01:44:36 +0000 (18:44 -0700)]
i915g: Improve the flush heuristic by using the previous frame's number of vertices.

13 years agor600g: fix replace_gpr_with_pv_ps
Vadim Girlin [Wed, 24 Aug 2011 20:32:55 +0000 (00:32 +0400)]
r600g: fix replace_gpr_with_pv_ps

Instructions with 3 source operands have no write mask, so we may replace their
destinations with PV/PS in the next group even if their dst.write is 0.

Note: This is a candidate for the 7.11 branch.

Signed-off-by: Vadim Girlin <vadimgirlin@gmail.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
13 years agor600g: fix check_and_set_bank_swizzle
Vadim Girlin [Wed, 24 Aug 2011 20:32:54 +0000 (00:32 +0400)]
r600g: fix check_and_set_bank_swizzle

Need to do full check when not all bank swizzles in the group are forced
(e.g. when trying to merge interp_* group with the next instruction)

Note: This is a candidate for the 7.11 branch.

Signed-off-by: Vadim Girlin <vadimgirlin@gmail.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
13 years agoglcpp: Add GL_ARB_conservative_depth #define.
Kenneth Graunke [Thu, 25 Aug 2011 20:11:36 +0000 (13:11 -0700)]
glcpp: Add GL_ARB_conservative_depth #define.

Forgotten in the patch that enabled the extension.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
13 years agoi965: Remove all bits of NRM3 and NRM4 code
Ian Romanick [Wed, 3 Aug 2011 02:29:52 +0000 (19:29 -0700)]
i965: Remove all bits of NRM3 and NRM4 code

Nothing in Mesa generates these opcodes, and i965 hardware cannot
support it natively.  If support were ever added for this opcode in
Mesa, there had better be a lowering pass for hardware that doesn't
support it natively.

13 years agoglsl: fix crash when a const is passed to texelFetchOffset
Dave Airlie [Thu, 25 Aug 2011 20:05:13 +0000 (21:05 +0100)]
glsl: fix crash when a const is passed to texelFetchOffset

while debugging texelFetchOffset we kept hitting the assert.

Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
13 years agoglsl: Bail after reporting an error for non-constant const_in parameters.
Kenneth Graunke [Thu, 25 Aug 2011 16:43:41 +0000 (09:43 -0700)]
glsl: Bail after reporting an error for non-constant const_in parameters.

Otherwise we continue and hit the "Illegal formal parameter mode"
assertion.

Fixes negative compile test texelFetchOffset.frag in piglit.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
13 years agopp: add files to Makefile.sources
Brian Paul [Thu, 25 Aug 2011 16:31:17 +0000 (10:31 -0600)]
pp: add files to Makefile.sources

13 years agoMerge branch 'kasanen-post-process-v2'
Brian Paul [Thu, 25 Aug 2011 16:12:12 +0000 (10:12 -0600)]
Merge branch 'kasanen-post-process-v2'

Conflicts:
src/gallium/auxiliary/Makefile
src/gallium/auxiliary/SConscript

13 years agosoftpipe: add const qualifier to silence warnings
Brian Paul [Thu, 25 Aug 2011 16:06:29 +0000 (10:06 -0600)]
softpipe: add const qualifier to silence warnings

13 years agoglsl_to_tgsi: add TXF support. (v2)
Dave Airlie [Thu, 25 Aug 2011 12:38:43 +0000 (13:38 +0100)]
glsl_to_tgsi: add TXF support. (v2)

This adds texelFetch support to translate from GLSL to TGSI TXF opcode.

I've tested this works with an r600g and softpipe backend.

v2: drop comments, fix title,

Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Bryan Cain <bryancain3@gmail.com>
13 years agosoftpipe: implement TXF support via get_texel callback
Dave Airlie [Thu, 25 Aug 2011 13:54:27 +0000 (14:54 +0100)]
softpipe: implement TXF support via get_texel callback

This just calls the texel fetch functions directly bypassing the sampling,

notes:
1: loops inside switch should be more optimal.
2: borders can be sampled though only up to border depth, outside that
its undefined.

Signed-off-by: Dave Airlie <airlied@redhat.com>
13 years agotgsi: add TXF support.
Dave Airlie [Thu, 25 Aug 2011 13:53:21 +0000 (14:53 +0100)]
tgsi: add TXF support.

This is a straight texel fetch with no filtering or clamping. It uses
integers to specify the i/j/k (from EXT_gpu_shader4).

To enable this I had to add another hook into the tgsi sampler so that
we could easily bypass all the filtering sample does.

Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
13 years agoglsl_to_tgsi: implement TXS/TXQ. (v2)
Dave Airlie [Wed, 24 Aug 2011 12:24:25 +0000 (13:24 +0100)]
glsl_to_tgsi: implement TXS/TXQ. (v2)

GLSL uses TXS, call the gallium TXQ opcode.

v2: fix indent from 4->3.

Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Bryan Cain <bryancain3@gmail.com>
13 years agosoftpipe: add get_dims callback for TXQ support. (v2)
Dave Airlie [Thu, 25 Aug 2011 10:35:52 +0000 (11:35 +0100)]
softpipe: add get_dims callback for TXQ support. (v2)

This adds the get_dims callback that is called from the tgsi exec_txq.

It returns values as per EXT_gpu_program4.

v2: fix one indent + use a switch (slighty modified from Brian)

Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Brian Paul <brianp@vmware.com>