Merge remote branch 'origin/master' into pipe-video
authorChristian König <deathsimple@vodafone.de>
Sat, 23 Apr 2011 12:27:40 +0000 (14:27 +0200)
committerChristian König <deathsimple@vodafone.de>
Sat, 23 Apr 2011 12:27:40 +0000 (14:27 +0200)
Conflicts:
configs/linux-dri
src/gallium/drivers/r600/r600_pipe.c
src/gallium/drivers/r600/r600_state.c
src/gallium/include/pipe/p_format.h
src/gallium/tests/graw/fragment-shader/frag-abs.sh
src/gallium/tests/graw/fragment-shader/frag-add.sh
src/gallium/tests/graw/fragment-shader/frag-cb-1d.sh
src/gallium/tests/graw/fragment-shader/frag-cb-2d.sh
src/gallium/tests/graw/fragment-shader/frag-dp3.sh
src/gallium/tests/graw/fragment-shader/frag-dp4.sh
src/gallium/tests/graw/fragment-shader/frag-dst.sh
src/gallium/tests/graw/fragment-shader/frag-ex2.sh
src/gallium/tests/graw/fragment-shader/frag-face.sh
src/gallium/tests/graw/fragment-shader/frag-flr.sh
src/gallium/tests/graw/fragment-shader/frag-frc.sh
src/gallium/tests/graw/fragment-shader/frag-kil.sh
src/gallium/tests/graw/fragment-shader/frag-lg2.sh
src/gallium/tests/graw/fragment-shader/frag-lit.sh
src/gallium/tests/graw/fragment-shader/frag-lrp.sh
src/gallium/tests/graw/fragment-shader/frag-mad-immx.sh
src/gallium/tests/graw/fragment-shader/frag-mad.sh
src/gallium/tests/graw/fragment-shader/frag-max.sh
src/gallium/tests/graw/fragment-shader/frag-min.sh
src/gallium/tests/graw/fragment-shader/frag-mov.sh
src/gallium/tests/graw/fragment-shader/frag-mul.sh
src/gallium/tests/graw/fragment-shader/frag-rcp.sh
src/gallium/tests/graw/fragment-shader/frag-rsq.sh
src/gallium/tests/graw/fragment-shader/frag-sge.sh
src/gallium/tests/graw/fragment-shader/frag-slt.sh
src/gallium/tests/graw/fragment-shader/frag-srcmod-abs.sh
src/gallium/tests/graw/fragment-shader/frag-srcmod-absneg.sh
src/gallium/tests/graw/fragment-shader/frag-srcmod-neg.sh
src/gallium/tests/graw/fragment-shader/frag-srcmod-swz.sh
src/gallium/tests/graw/fragment-shader/frag-sub.sh
src/gallium/tests/graw/fragment-shader/frag-tempx.sh
src/gallium/tests/graw/fragment-shader/frag-xpd.sh
src/gallium/tests/graw/vertex-shader/vert-abs.sh
src/gallium/tests/graw/vertex-shader/vert-add.sh
src/gallium/tests/graw/vertex-shader/vert-arl.sh
src/gallium/tests/graw/vertex-shader/vert-arr.sh
src/gallium/tests/graw/vertex-shader/vert-cb-1d.sh
src/gallium/tests/graw/vertex-shader/vert-cb-2d.sh
src/gallium/tests/graw/vertex-shader/vert-dp3.sh
src/gallium/tests/graw/vertex-shader/vert-dp4.sh
src/gallium/tests/graw/vertex-shader/vert-dst.sh
src/gallium/tests/graw/vertex-shader/vert-ex2.sh
src/gallium/tests/graw/vertex-shader/vert-flr.sh
src/gallium/tests/graw/vertex-shader/vert-frc.sh
src/gallium/tests/graw/vertex-shader/vert-lg2.sh
src/gallium/tests/graw/vertex-shader/vert-lit.sh
src/gallium/tests/graw/vertex-shader/vert-lrp.sh
src/gallium/tests/graw/vertex-shader/vert-mad.sh
src/gallium/tests/graw/vertex-shader/vert-max.sh
src/gallium/tests/graw/vertex-shader/vert-min.sh
src/gallium/tests/graw/vertex-shader/vert-mov.sh
src/gallium/tests/graw/vertex-shader/vert-mul.sh
src/gallium/tests/graw/vertex-shader/vert-rcp.sh
src/gallium/tests/graw/vertex-shader/vert-rsq.sh
src/gallium/tests/graw/vertex-shader/vert-sge.sh
src/gallium/tests/graw/vertex-shader/vert-slt.sh
src/gallium/tests/graw/vertex-shader/vert-srcmod-abs.sh
src/gallium/tests/graw/vertex-shader/vert-srcmod-absneg.sh
src/gallium/tests/graw/vertex-shader/vert-srcmod-neg.sh
src/gallium/tests/graw/vertex-shader/vert-srcmod-swz.sh
src/gallium/tests/graw/vertex-shader/vert-sub.sh
src/gallium/tests/graw/vertex-shader/vert-xpd.sh
src/gallium/tools/trace/dump.py
src/gallium/tools/trace/format.py
src/gallium/tools/trace/model.py
src/gallium/tools/trace/parse.py

13 files changed:
1  2 
configs/linux-dri
configure.ac
src/gallium/auxiliary/Makefile
src/gallium/auxiliary/SConscript
src/gallium/auxiliary/util/u_format.csv
src/gallium/auxiliary/vl/vl_mpeg12_decoder.c
src/gallium/drivers/nvfx/nvfx_screen.c
src/gallium/drivers/r600/eg_state_inlines.h
src/gallium/drivers/r600/r600_pipe.c
src/gallium/drivers/r600/r600_state_inlines.h
src/gallium/include/pipe/p_defines.h
src/gallium/include/pipe/p_format.h
src/mesa/state_tracker/st_format.c

index ce2da8317d754443ad88d6d75b16f4e84b395ddf,7ee007e35276f3263d5f7ca8e5096c56b2e7b2f4..4f4b59dae9ed00785d73a73afb4710746d958456
@@@ -59,12 -59,12 +59,13 @@@ SRC_DIRS := glx egl $(SRC_DIRS
  EGL_DRIVERS_DIRS = glx
  
  DRIVER_DIRS = dri
 +
  GALLIUM_WINSYS_DIRS = sw sw/xlib drm/vmware drm/intel drm/i965
 -GALLIUM_TARGET_DIRS = 
 -GALLIUM_STATE_TRACKERS_DIRS = egl
 +GALLIUM_TARGET_DIRS = egl-swrast
 +GALLIUM_STATE_TRACKERS_DIRS = egl vdpau
  
- DRI_DIRS = r300 radeon swrast
+ DRI_DIRS = i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon \
+       savage sis tdfx unichrome swrast
  
  INTEL_LIBS = `pkg-config --libs libdrm_intel`
  INTEL_CFLAGS = `pkg-config --cflags libdrm_intel`
diff --cc configure.ac
Simple merge
Simple merge
Simple merge
index 16b204df67621e7e0963e39cae27d4d4ae369d6b,0000000000000000000000000000000000000000..5027db4314e8b8234123a87925fad442f02c8183
mode 100644,000000..100644
--- /dev/null
@@@ -1,856 -1,0 +1,856 @@@
-    struct pipe_sampler_view *matrix, *transpose;
 +/**************************************************************************
 + *
 + * Copyright 2009 Younes Manton.
 + * All Rights Reserved.
 + *
 + * Permission is hereby granted, free of charge, to any person obtaining a
 + * copy of this software and associated documentation files (the
 + * "Software"), to deal in the Software without restriction, including
 + * without limitation the rights to use, copy, modify, merge, publish,
 + * distribute, sub license, and/or sell copies of the Software, and to
 + * permit persons to whom the Software is furnished to do so, subject to
 + * the following conditions:
 + *
 + * The above copyright notice and this permission notice (including the
 + * next paragraph) shall be included in all copies or substantial portions
 + * of the Software.
 + *
 + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
 + * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
 + * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 + * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 + *
 + **************************************************************************/
 +
 +#include <math.h>
 +#include <assert.h>
 +
 +#include <util/u_memory.h>
 +#include <util/u_rect.h>
 +#include <util/u_video.h>
 +
 +#include "vl_mpeg12_decoder.h"
 +#include "vl_defines.h"
 +
 +#define SCALE_FACTOR_SNORM (32768.0f / 256.0f)
 +#define SCALE_FACTOR_SSCALED (1.0f / 256.0f)
 +
 +static const enum pipe_format const_zscan_source_formats[] = {
 +   PIPE_FORMAT_R16_SNORM,
 +   PIPE_FORMAT_R16_SSCALED
 +};
 +
 +static const unsigned num_zscan_source_formats =
 +   sizeof(const_zscan_source_formats) / sizeof(enum pipe_format);
 +
 +static const enum pipe_format const_idct_source_formats[] = {
 +   PIPE_FORMAT_R16G16B16A16_SNORM,
 +   PIPE_FORMAT_R16G16B16A16_SSCALED
 +};
 +
 +static const unsigned num_idct_source_formats =
 +   sizeof(const_idct_source_formats) / sizeof(enum pipe_format);
 +
 +static const enum pipe_format const_idct_intermediate_formats[] = {
 +   PIPE_FORMAT_R16G16B16A16_FLOAT,
 +   PIPE_FORMAT_R16G16B16A16_SNORM,
 +   PIPE_FORMAT_R16G16B16A16_SSCALED,
 +   PIPE_FORMAT_R32G32B32A32_FLOAT
 +};
 +
 +static const unsigned num_idct_intermediate_formats =
 +   sizeof(const_idct_intermediate_formats) / sizeof(enum pipe_format);
 +
 +static const enum pipe_format const_mc_source_formats[] = {
 +   PIPE_FORMAT_R16_SNORM,
 +   PIPE_FORMAT_R16_SSCALED
 +};
 +
 +static const unsigned num_mc_source_formats =
 +   sizeof(const_mc_source_formats) / sizeof(enum pipe_format);
 +
 +static bool
 +init_zscan_buffer(struct vl_mpeg12_buffer *buffer)
 +{
 +   enum pipe_format formats[3];
 +
 +   struct pipe_sampler_view **source;
 +   struct pipe_surface **destination;
 +
 +   struct vl_mpeg12_decoder *dec;
 +
 +   unsigned i;
 +
 +   assert(buffer);
 +
 +   dec = (struct vl_mpeg12_decoder*)buffer->base.decoder;
 +
 +   formats[0] = formats[1] = formats[2] = dec->zscan_source_format;
 +   buffer->zscan_source = vl_video_buffer_init(dec->base.context, dec->pipe,
 +                                               dec->blocks_per_line * BLOCK_WIDTH * BLOCK_HEIGHT,
 +                                               dec->max_blocks / dec->blocks_per_line,
 +                                               1, PIPE_VIDEO_CHROMA_FORMAT_444,
 +                                               formats, PIPE_USAGE_STATIC);
 +   if (!buffer->zscan_source)
 +      goto error_source;
 +
 +   source = buffer->zscan_source->get_sampler_views(buffer->zscan_source);
 +   if (!source)
 +      goto error_sampler;
 +
 +   if (dec->base.entrypoint <= PIPE_VIDEO_ENTRYPOINT_IDCT)
 +      destination = buffer->idct_source->get_surfaces(buffer->idct_source);
 +   else
 +      destination = buffer->mc_source->get_surfaces(buffer->mc_source);
 +
 +   if (!destination)
 +      goto error_surface;
 +
 +   for (i = 0; i < VL_MAX_PLANES; ++i)
 +      if (!vl_zscan_init_buffer(i == 0 ? &dec->zscan_y : &dec->zscan_c,
 +                                &buffer->zscan[i], source[i], destination[i]))
 +         goto error_plane;
 +
 +   return true;
 +
 +error_plane:
 +   for (; i > 0; --i)
 +      vl_zscan_cleanup_buffer(&buffer->zscan[i - 1]);
 +
 +error_surface:
 +error_sampler:
 +   buffer->zscan_source->destroy(buffer->zscan_source);
 +
 +error_source:
 +   return false;
 +}
 +
 +static void
 +cleanup_zscan_buffer(struct vl_mpeg12_buffer *buffer)
 +{
 +   unsigned i;
 +
 +   assert(buffer);
 +
 +   for (i = 0; i < VL_MAX_PLANES; ++i)
 +      vl_zscan_cleanup_buffer(&buffer->zscan[i]);
 +   buffer->zscan_source->destroy(buffer->zscan_source);
 +}
 +
 +static bool
 +init_idct_buffer(struct vl_mpeg12_buffer *buffer)
 +{
 +   enum pipe_format formats[3];
 +
 +   struct pipe_sampler_view **idct_source_sv, **idct_intermediate_sv;
 +   struct pipe_surface **idct_surfaces;
 +
 +   struct vl_mpeg12_decoder *dec;
 +
 +   unsigned i;
 +
 +   assert(buffer);
 +
 +   dec = (struct vl_mpeg12_decoder*)buffer->base.decoder;
 +
 +   formats[0] = formats[1] = formats[2] = dec->idct_source_format;
 +   buffer->idct_source = vl_video_buffer_init(dec->base.context, dec->pipe,
 +                                              dec->base.width / 4, dec->base.height, 1,
 +                                              dec->base.chroma_format,
 +                                              formats, PIPE_USAGE_STATIC);
 +   if (!buffer->idct_source)
 +      goto error_source;
 +
 +   formats[0] = formats[1] = formats[2] = dec->idct_intermediate_format;
 +   buffer->idct_intermediate = vl_video_buffer_init(dec->base.context, dec->pipe,
 +                                                    dec->base.width / dec->nr_of_idct_render_targets,
 +                                                    dec->base.height / 4, dec->nr_of_idct_render_targets,
 +                                                    dec->base.chroma_format,
 +                                                    formats, PIPE_USAGE_STATIC);
 +
 +   if (!buffer->idct_intermediate)
 +      goto error_intermediate;
 +
 +   idct_source_sv = buffer->idct_source->get_sampler_views(buffer->idct_source);
 +   if (!idct_source_sv)
 +      goto error_source_sv;
 +
 +   idct_intermediate_sv = buffer->idct_intermediate->get_sampler_views(buffer->idct_intermediate);
 +   if (!idct_intermediate_sv)
 +      goto error_intermediate_sv;
 +
 +   idct_surfaces = buffer->mc_source->get_surfaces(buffer->mc_source);
 +   if (!idct_surfaces)
 +      goto error_surfaces;
 +
 +   for (i = 0; i < 3; ++i)
 +      if (!vl_idct_init_buffer(i == 0 ? &dec->idct_y : &dec->idct_c,
 +                               &buffer->idct[i], idct_source_sv[i],
 +                               idct_intermediate_sv[i], idct_surfaces[i]))
 +         goto error_plane;
 +
 +   return true;
 +
 +error_plane:
 +   for (; i > 0; --i)
 +      vl_idct_cleanup_buffer(i == 1 ? &dec->idct_c : &dec->idct_y, &buffer->idct[i - 1]);
 +
 +error_surfaces:
 +error_intermediate_sv:
 +error_source_sv:
 +   buffer->idct_intermediate->destroy(buffer->idct_intermediate);
 +
 +error_intermediate:
 +   buffer->idct_source->destroy(buffer->idct_source);
 +
 +error_source:
 +   return false;
 +}
 +
 +static void
 +cleanup_idct_buffer(struct vl_mpeg12_buffer *buf)
 +{
 +   struct vl_mpeg12_decoder *dec;
 +   assert(buf);
 +
 +   dec = (struct vl_mpeg12_decoder*)buf->base.decoder;
 +   assert(dec);
 +
 +   vl_idct_cleanup_buffer(&dec->idct_y, &buf->idct[0]);
 +   vl_idct_cleanup_buffer(&dec->idct_c, &buf->idct[1]);
 +   vl_idct_cleanup_buffer(&dec->idct_c, &buf->idct[2]);
 +   buf->idct_source->destroy(buf->idct_source);
 +   buf->idct_intermediate->destroy(buf->idct_intermediate);
 +}
 +
 +static bool
 +init_mc_buffer(struct vl_mpeg12_buffer *buf)
 +{
 +   struct vl_mpeg12_decoder *dec;
 +   enum pipe_format formats[3];
 +   struct pipe_sampler_view **mc_source_sv;
 +
 +   assert(buf);
 +
 +   dec = (struct vl_mpeg12_decoder*)buf->base.decoder;
 +   assert(dec);
 +
 +   formats[0] = formats[1] = formats[2] =dec->mc_source_format;
 +   buf->mc_source = vl_video_buffer_init(dec->base.context, dec->pipe,
 +                                            dec->base.width, dec->base.height, 1,
 +                                            dec->base.chroma_format,
 +                                            formats, PIPE_USAGE_STATIC);
 +
 +   if (!buf->mc_source)
 +      goto error_mc_source;
 +
 +   mc_source_sv = buf->mc_source->get_sampler_views(buf->mc_source);
 +   if (!mc_source_sv)
 +      goto error_mc_source_sv;
 +
 +   if(!vl_mc_init_buffer(&dec->mc_y, &buf->mc[0], mc_source_sv[0]))
 +      goto error_mc_y;
 +
 +   if(!vl_mc_init_buffer(&dec->mc_c, &buf->mc[1], mc_source_sv[1]))
 +      goto error_mc_cb;
 +
 +   if(!vl_mc_init_buffer(&dec->mc_c, &buf->mc[2], mc_source_sv[2]))
 +      goto error_mc_cr;
 +
 +   return true;
 +
 +error_mc_cr:
 +   vl_mc_cleanup_buffer(&buf->mc[1]);
 +
 +error_mc_cb:
 +   vl_mc_cleanup_buffer(&buf->mc[0]);
 +
 +error_mc_y:
 +error_mc_source_sv:
 +   buf->mc_source->destroy(buf->mc_source);
 +
 +error_mc_source:
 +   return false;
 +}
 +
 +static void
 +cleanup_mc_buffer(struct vl_mpeg12_buffer *buf)
 +{
 +   unsigned i;
 +
 +   assert(buf);
 +
 +   for (i = 0; i < VL_MAX_PLANES; ++i)
 +      vl_mc_cleanup_buffer(&buf->mc[i]);
 +
 +   buf->mc_source->destroy(buf->mc_source);
 +}
 +
 +static void
 +vl_mpeg12_buffer_destroy(struct pipe_video_decode_buffer *buffer)
 +{
 +   struct vl_mpeg12_buffer *buf = (struct vl_mpeg12_buffer*)buffer;
 +   struct vl_mpeg12_decoder *dec;
 +
 +   assert(buf);
 +
 +   dec = (struct vl_mpeg12_decoder*)buf->base.decoder;
 +   assert(dec);
 +
 +   cleanup_zscan_buffer(buf);
 +
 +   if (dec->base.entrypoint <= PIPE_VIDEO_ENTRYPOINT_IDCT)
 +      cleanup_idct_buffer(buf);
 +
 +   cleanup_mc_buffer(buf);
 +
 +   vl_vb_cleanup(&buf->vertex_stream);
 +
 +   FREE(buf);
 +}
 +
 +static void
 +vl_mpeg12_buffer_map(struct pipe_video_decode_buffer *buffer)
 +{
 +   struct vl_mpeg12_buffer *buf = (struct vl_mpeg12_buffer*)buffer;
 +   struct vl_mpeg12_decoder *dec;
 +
 +   struct pipe_sampler_view **sampler_views;
 +   unsigned i;
 +
 +   assert(buf);
 +
 +   dec = (struct vl_mpeg12_decoder *)buf->base.decoder;
 +   assert(dec);
 +
 +   vl_vb_map(&buf->vertex_stream, dec->pipe);
 +
 +   sampler_views = buf->zscan_source->get_sampler_views(buf->zscan_source);
 +
 +   assert(sampler_views);
 +
 +   for (i = 0; i < VL_MAX_PLANES; ++i) {
 +      struct pipe_resource *tex = sampler_views[i]->texture;
 +      struct pipe_box rect =
 +      {
 +         0, 0, 0,
 +         tex->width0,
 +         tex->height0,
 +         1
 +      };
 +
 +      buf->tex_transfer[i] = dec->pipe->get_transfer
 +      (
 +         dec->pipe, tex,
 +         0, PIPE_TRANSFER_WRITE | PIPE_TRANSFER_DISCARD,
 +         &rect
 +      );
 +
 +      buf->texels[i] = dec->pipe->transfer_map(dec->pipe, buf->tex_transfer[i]);
 +   }
 +}
 +
 +static struct pipe_ycbcr_block *
 +vl_mpeg12_buffer_get_ycbcr_stream(struct pipe_video_decode_buffer *buffer, int component)
 +{
 +   struct vl_mpeg12_buffer *buf = (struct vl_mpeg12_buffer*)buffer;
 +
 +   assert(buf);
 +
 +   return vl_vb_get_ycbcr_stream(&buf->vertex_stream, component);
 +}
 +
 +static short *
 +vl_mpeg12_buffer_get_ycbcr_buffer(struct pipe_video_decode_buffer *buffer, int component)
 +{
 +   struct vl_mpeg12_buffer *buf = (struct vl_mpeg12_buffer*)buffer;
 +
 +   assert(buf);
 +   assert(component < VL_MAX_PLANES);
 +
 +   return buf->texels[component];
 +}
 +
 +static unsigned
 +vl_mpeg12_buffer_get_mv_stream_stride(struct pipe_video_decode_buffer *buffer)
 +{
 +   struct vl_mpeg12_buffer *buf = (struct vl_mpeg12_buffer*)buffer;
 +
 +   assert(buf);
 +
 +   return vl_vb_get_mv_stream_stride(&buf->vertex_stream);
 +}
 +
 +static struct pipe_motionvector *
 +vl_mpeg12_buffer_get_mv_stream(struct pipe_video_decode_buffer *buffer, int ref_frame)
 +{
 +   struct vl_mpeg12_buffer *buf = (struct vl_mpeg12_buffer*)buffer;
 +
 +   assert(buf);
 +
 +   return vl_vb_get_mv_stream(&buf->vertex_stream, ref_frame);
 +}
 +
 +static void
 +vl_mpeg12_buffer_unmap(struct pipe_video_decode_buffer *buffer)
 +{
 +   struct vl_mpeg12_buffer *buf = (struct vl_mpeg12_buffer*)buffer;
 +   struct vl_mpeg12_decoder *dec;
 +   unsigned i;
 +
 +   assert(buf);
 +
 +   dec = (struct vl_mpeg12_decoder *)buf->base.decoder;
 +   assert(dec);
 +
 +   vl_vb_unmap(&buf->vertex_stream, dec->pipe);
 +
 +   for (i = 0; i < VL_MAX_PLANES; ++i) {
 +      dec->pipe->transfer_unmap(dec->pipe, buf->tex_transfer[i]);
 +      dec->pipe->transfer_destroy(dec->pipe, buf->tex_transfer[i]);
 +   }
 +}
 +
 +static void
 +vl_mpeg12_destroy(struct pipe_video_decoder *decoder)
 +{
 +   struct vl_mpeg12_decoder *dec = (struct vl_mpeg12_decoder*)decoder;
 +
 +   assert(decoder);
 +
 +   /* Asserted in softpipe_delete_fs_state() for some reason */
 +   dec->pipe->bind_vs_state(dec->pipe, NULL);
 +   dec->pipe->bind_fs_state(dec->pipe, NULL);
 +
 +   dec->pipe->delete_depth_stencil_alpha_state(dec->pipe, dec->dsa);
 +
 +   vl_mc_cleanup(&dec->mc_y);
 +   vl_mc_cleanup(&dec->mc_c);
 +
 +   if (dec->base.entrypoint <= PIPE_VIDEO_ENTRYPOINT_IDCT) {
 +      vl_idct_cleanup(&dec->idct_y);
 +      vl_idct_cleanup(&dec->idct_c);
 +   }
 +
 +   vl_zscan_cleanup(&dec->zscan_y);
 +   vl_zscan_cleanup(&dec->zscan_c);
 +
 +   dec->pipe->delete_vertex_elements_state(dec->pipe, dec->ves_ycbcr);
 +   dec->pipe->delete_vertex_elements_state(dec->pipe, dec->ves_mv);
 +
 +   pipe_resource_reference(&dec->quads.buffer, NULL);
 +   pipe_resource_reference(&dec->pos.buffer, NULL);
 +
 +   FREE(dec);
 +}
 +
 +static struct pipe_video_decode_buffer *
 +vl_mpeg12_create_buffer(struct pipe_video_decoder *decoder)
 +{
 +   struct vl_mpeg12_decoder *dec = (struct vl_mpeg12_decoder*)decoder;
 +   struct vl_mpeg12_buffer *buffer;
 +
 +   assert(dec);
 +
 +   buffer = CALLOC_STRUCT(vl_mpeg12_buffer);
 +   if (buffer == NULL)
 +      return NULL;
 +
 +   buffer->base.decoder = decoder;
 +   buffer->base.destroy = vl_mpeg12_buffer_destroy;
 +   buffer->base.map = vl_mpeg12_buffer_map;
 +   buffer->base.get_ycbcr_stream = vl_mpeg12_buffer_get_ycbcr_stream;
 +   buffer->base.get_ycbcr_buffer = vl_mpeg12_buffer_get_ycbcr_buffer;
 +   buffer->base.get_mv_stream_stride = vl_mpeg12_buffer_get_mv_stream_stride;
 +   buffer->base.get_mv_stream = vl_mpeg12_buffer_get_mv_stream;
 +   buffer->base.unmap = vl_mpeg12_buffer_unmap;
 +
 +   if (!vl_vb_init(&buffer->vertex_stream, dec->pipe,
 +                   dec->base.width / MACROBLOCK_WIDTH,
 +                   dec->base.height / MACROBLOCK_HEIGHT))
 +      goto error_vertex_buffer;
 +
 +   if (!init_mc_buffer(buffer))
 +      goto error_mc;
 +
 +   if (dec->base.entrypoint <= PIPE_VIDEO_ENTRYPOINT_IDCT)
 +      if (!init_idct_buffer(buffer))
 +         goto error_idct;
 +
 +   if (!init_zscan_buffer(buffer))
 +      goto error_zscan;
 +
 +   return &buffer->base;
 +
 +error_zscan:
 +   if (dec->base.entrypoint <= PIPE_VIDEO_ENTRYPOINT_IDCT)
 +      cleanup_idct_buffer(buffer);
 +
 +error_idct:
 +   cleanup_mc_buffer(buffer);
 +
 +error_mc:
 +   vl_vb_cleanup(&buffer->vertex_stream);
 +
 +error_vertex_buffer:
 +   FREE(buffer);
 +   return NULL;
 +}
 +
 +static void
 +vl_mpeg12_decoder_flush_buffer(struct pipe_video_decode_buffer *buffer,
 +                               unsigned num_ycbcr_blocks[3],
 +                               struct pipe_video_buffer *refs[2],
 +                               struct pipe_video_buffer *dst,
 +                               struct pipe_fence_handle **fence)
 +{
 +   struct vl_mpeg12_buffer *buf = (struct vl_mpeg12_buffer *)buffer;
 +   struct vl_mpeg12_decoder *dec;
 +
 +   struct pipe_sampler_view **sv[2];
 +   struct pipe_surface **surfaces;
 +
 +   struct pipe_vertex_buffer vb[3];
 +
 +   unsigned i, j;
 +
 +   assert(buf);
 +
 +   dec = (struct vl_mpeg12_decoder *)buf->base.decoder;
 +   assert(dec);
 +
 +   for (i = 0; i < 2; ++i)
 +      sv[i] = refs[i] ? refs[i]->get_sampler_views(refs[i]) : NULL;
 +
 +   surfaces = dst->get_surfaces(dst);
 +
 +   vb[0] = dec->quads;
 +   vb[1] = dec->pos;
 +
 +   dec->pipe->bind_vertex_elements_state(dec->pipe, dec->ves_mv);
 +   for (i = 0; i < VL_MAX_PLANES; ++i) {
 +      vl_mc_set_surface(&buf->mc[i], surfaces[i]);
 +
 +      for (j = 0; j < 2; ++j) {
 +         if (sv[j] == NULL) continue;
 +
 +         vb[2] = vl_vb_get_mv(&buf->vertex_stream, j);;
 +         dec->pipe->set_vertex_buffers(dec->pipe, 3, vb);
 +
 +         vl_mc_render_ref(&buf->mc[i], sv[j][i]);
 +      }
 +   }
 +
 +   dec->pipe->bind_vertex_elements_state(dec->pipe, dec->ves_ycbcr);
 +   for (i = 0; i < VL_MAX_PLANES; ++i) {
 +      if (num_ycbcr_blocks[i] == 0) continue;
 +
 +      vb[1] = vl_vb_get_ycbcr(&buf->vertex_stream, i);
 +      dec->pipe->set_vertex_buffers(dec->pipe, 2, vb);
 +
 +      vl_zscan_render(&buf->zscan[i] , num_ycbcr_blocks[i]);
 +
 +      if (dec->base.entrypoint <= PIPE_VIDEO_ENTRYPOINT_IDCT)
 +         vl_idct_flush(i == 0 ? &dec->idct_y : &dec->idct_c, &buf->idct[i], num_ycbcr_blocks[i]);
 +
 +      vl_mc_render_ycbcr(&buf->mc[i], num_ycbcr_blocks[i]);
 +   }
 +
 +   dec->pipe->flush(dec->pipe, fence);
 +}
 +
 +static bool
 +init_pipe_state(struct vl_mpeg12_decoder *dec)
 +{
 +   struct pipe_depth_stencil_alpha_state dsa;
 +   unsigned i;
 +
 +   assert(dec);
 +
 +   memset(&dsa, 0, sizeof dsa);
 +   dsa.depth.enabled = 0;
 +   dsa.depth.writemask = 0;
 +   dsa.depth.func = PIPE_FUNC_ALWAYS;
 +   for (i = 0; i < 2; ++i) {
 +      dsa.stencil[i].enabled = 0;
 +      dsa.stencil[i].func = PIPE_FUNC_ALWAYS;
 +      dsa.stencil[i].fail_op = PIPE_STENCIL_OP_KEEP;
 +      dsa.stencil[i].zpass_op = PIPE_STENCIL_OP_KEEP;
 +      dsa.stencil[i].zfail_op = PIPE_STENCIL_OP_KEEP;
 +      dsa.stencil[i].valuemask = 0;
 +      dsa.stencil[i].writemask = 0;
 +   }
 +   dsa.alpha.enabled = 0;
 +   dsa.alpha.func = PIPE_FUNC_ALWAYS;
 +   dsa.alpha.ref_value = 0;
 +   dec->dsa = dec->pipe->create_depth_stencil_alpha_state(dec->pipe, &dsa);
 +   dec->pipe->bind_depth_stencil_alpha_state(dec->pipe, dec->dsa);
 +
 +   return true;
 +}
 +
 +static enum pipe_format
 +find_first_supported_format(struct vl_mpeg12_decoder *dec,
 +                            const enum pipe_format formats[],
 +                            unsigned num_formats,
 +                            enum pipe_texture_target target)
 +{
 +   struct pipe_screen *screen;
 +   unsigned i;
 +
 +   assert(dec);
 +
 +   screen = dec->pipe->screen;
 +
 +   for (i = 0; i < num_formats; ++i)
 +      if (screen->is_format_supported(dec->pipe->screen, formats[i], target, 1,
 +                                      PIPE_BIND_SAMPLER_VIEW | PIPE_BIND_RENDER_TARGET))
 +         return formats[i];
 +
 +   return PIPE_FORMAT_NONE;
 +}
 +
 +static bool
 +init_zscan(struct vl_mpeg12_decoder *dec)
 +{
 +   struct pipe_sampler_view *layout;
 +
 +   unsigned num_channels;
 +
 +   assert(dec);
 +
 +   dec->blocks_per_line = 4;
 +   dec->max_blocks =
 +      (dec->base.width * dec->base.height) /
 +      (BLOCK_WIDTH * BLOCK_HEIGHT);
 +
 +   dec->zscan_source_format = find_first_supported_format(dec, const_zscan_source_formats,
 +                                                          num_zscan_source_formats, PIPE_TEXTURE_2D);
 +
 +   if (dec->zscan_source_format == PIPE_FORMAT_NONE)
 +      return false;
 +
 +   layout = vl_zscan_linear(dec->pipe, dec->blocks_per_line);
 +
 +   num_channels = dec->base.entrypoint <= PIPE_VIDEO_ENTRYPOINT_IDCT ? 4 : 1;
 +
 +   if (!vl_zscan_init(&dec->zscan_y, dec->pipe, dec->base.width, dec->base.height,
 +                      dec->blocks_per_line, dec->max_blocks, num_channels))
 +      return false;
 +
 +   vl_zscan_set_layout(&dec->zscan_y, layout);
 +
 +   if (!vl_zscan_init(&dec->zscan_c, dec->pipe, dec->chroma_width, dec->chroma_height,
 +                      dec->blocks_per_line, dec->max_blocks, num_channels))
 +      return false;
 +
 +   vl_zscan_set_layout(&dec->zscan_c, layout);
 +
 +   return true;
 +}
 +
 +static bool
 +init_idct(struct vl_mpeg12_decoder *dec)
 +{
++   struct pipe_sampler_view *matrix, *transpose = NULL;
 +   float matrix_scale, transpose_scale;
 +
 +   dec->nr_of_idct_render_targets = dec->pipe->screen->get_param(dec->pipe->screen, PIPE_CAP_MAX_RENDER_TARGETS);
 +
 +   // more than 4 render targets usually doesn't makes any seens
 +   dec->nr_of_idct_render_targets = MIN2(dec->nr_of_idct_render_targets, 4);
 +
 +   dec->idct_source_format = find_first_supported_format(dec, const_idct_source_formats,
 +                                                         num_idct_source_formats, PIPE_TEXTURE_2D);
 +
 +   if (dec->idct_source_format == PIPE_FORMAT_NONE)
 +      return false;
 +
 +   dec->idct_intermediate_format = find_first_supported_format(dec, const_idct_intermediate_formats,
 +                                                               num_idct_intermediate_formats, PIPE_TEXTURE_3D);
 +
 +   if (dec->idct_intermediate_format == PIPE_FORMAT_NONE)
 +      return false;
 +
 +   switch (dec->idct_source_format) {
 +   case PIPE_FORMAT_R16G16B16A16_SSCALED:
 +      matrix_scale = SCALE_FACTOR_SSCALED;
 +      break;
 +
 +   case PIPE_FORMAT_R16G16B16A16_SNORM:
 +      matrix_scale = SCALE_FACTOR_SNORM;
 +      break;
 +
 +   default:
 +      assert(0);
 +      return false;
 +   }
 +
 +   if (dec->idct_intermediate_format == PIPE_FORMAT_R16G16B16A16_FLOAT ||
 +       dec->idct_intermediate_format == PIPE_FORMAT_R32G32B32A32_FLOAT)
 +      transpose_scale = 1.0f;
 +   else
 +      transpose_scale = matrix_scale = sqrt(matrix_scale);
 +
 +   if (dec->mc_source_format == PIPE_FORMAT_R16_SSCALED)
 +      transpose_scale /= SCALE_FACTOR_SSCALED;
 +
 +   if (!(matrix = vl_idct_upload_matrix(dec->pipe, matrix_scale)))
 +      goto error_matrix;
 +
 +   if (matrix_scale != transpose_scale) {
 +      if (!(transpose = vl_idct_upload_matrix(dec->pipe, transpose_scale)))
 +         goto error_transpose;
 +   } else
 +      pipe_sampler_view_reference(&transpose, matrix);
 +
 +   if (!vl_idct_init(&dec->idct_y, dec->pipe, dec->base.width, dec->base.height,
 +                     dec->nr_of_idct_render_targets, matrix, transpose))
 +      goto error_y;
 +
 +   if(!vl_idct_init(&dec->idct_c, dec->pipe, dec->chroma_width, dec->chroma_height,
 +                    dec->nr_of_idct_render_targets, matrix, transpose))
 +      goto error_c;
 +
 +   pipe_sampler_view_reference(&matrix, NULL);
 +   pipe_sampler_view_reference(&transpose, NULL);
 +   return true;
 +
 +error_c:
 +   vl_idct_cleanup(&dec->idct_y);
 +
 +error_y:
 +   pipe_sampler_view_reference(&transpose, NULL);
 +
 +error_transpose:
 +   pipe_sampler_view_reference(&matrix, NULL);
 +
 +error_matrix:
 +   return false;
 +}
 +
 +struct pipe_video_decoder *
 +vl_create_mpeg12_decoder(struct pipe_video_context *context,
 +                         struct pipe_context *pipe,
 +                         enum pipe_video_profile profile,
 +                         enum pipe_video_entrypoint entrypoint,
 +                         enum pipe_video_chroma_format chroma_format,
 +                         unsigned width, unsigned height)
 +{
 +   struct vl_mpeg12_decoder *dec;
 +   float mc_scale;
 +
 +   assert(u_reduce_video_profile(profile) == PIPE_VIDEO_CODEC_MPEG12);
 +
 +   dec = CALLOC_STRUCT(vl_mpeg12_decoder);
 +
 +   if (!dec)
 +      return NULL;
 +
 +   dec->base.context = context;
 +   dec->base.profile = profile;
 +   dec->base.entrypoint = entrypoint;
 +   dec->base.chroma_format = chroma_format;
 +   dec->base.width = width;
 +   dec->base.height = height;
 +
 +   dec->base.destroy = vl_mpeg12_destroy;
 +   dec->base.create_buffer = vl_mpeg12_create_buffer;
 +   dec->base.flush_buffer = vl_mpeg12_decoder_flush_buffer;
 +
 +   dec->base.width = align(width, MACROBLOCK_WIDTH);
 +   dec->base.height = align(height, MACROBLOCK_HEIGHT);
 +
 +   dec->pipe = pipe;
 +
 +   dec->quads = vl_vb_upload_quads(dec->pipe);
 +   dec->pos = vl_vb_upload_pos(
 +      dec->pipe,
 +      dec->base.width / MACROBLOCK_WIDTH,
 +      dec->base.height / MACROBLOCK_HEIGHT
 +   );
 +
 +   dec->ves_ycbcr = vl_vb_get_ves_ycbcr(dec->pipe);
 +   dec->ves_mv = vl_vb_get_ves_mv(dec->pipe);
 +
 +   /* TODO: Implement 422, 444 */
 +   assert(dec->base.chroma_format == PIPE_VIDEO_CHROMA_FORMAT_420);
 +
 +   dec->mc_source_format = find_first_supported_format(dec, const_mc_source_formats,
 +                                                       num_mc_source_formats, PIPE_TEXTURE_3D);
 +
 +   if (dec->mc_source_format == PIPE_FORMAT_NONE)
 +      return NULL;
 +
 +   if (dec->base.chroma_format == PIPE_VIDEO_CHROMA_FORMAT_420) {
 +      dec->chroma_width = dec->base.width / 2;
 +      dec->chroma_height = dec->base.height / 2;
 +   } else if (dec->base.chroma_format == PIPE_VIDEO_CHROMA_FORMAT_422) {
 +      dec->chroma_width = dec->base.width;
 +      dec->chroma_height = dec->base.height / 2;
 +   } else {
 +      dec->chroma_width = dec->base.width;
 +      dec->chroma_height = dec->base.height;
 +   }
 +
 +   if (!init_zscan(dec))
 +      goto error_zscan;
 +
 +   if (entrypoint <= PIPE_VIDEO_ENTRYPOINT_IDCT) {
 +      if (!init_idct(dec))
 +         goto error_idct;
 +      if (dec->mc_source_format == PIPE_FORMAT_R16_SSCALED)
 +         mc_scale = SCALE_FACTOR_SSCALED;
 +      else
 +         mc_scale = 1.0f;
 +   } else {
 +      switch (dec->mc_source_format) {
 +      case PIPE_FORMAT_R16_SNORM:
 +         mc_scale = SCALE_FACTOR_SNORM;
 +         break;
 +
 +      case PIPE_FORMAT_R16_SSCALED:
 +         mc_scale = SCALE_FACTOR_SSCALED;
 +         break;
 +
 +      default:
 +         assert(0);
 +         return NULL;
 +      }
 +   }
 +
 +   if (!vl_mc_init(&dec->mc_y, dec->pipe, dec->base.width, dec->base.height, MACROBLOCK_HEIGHT, mc_scale))
 +      goto error_mc_y;
 +
 +   // TODO
 +   if (!vl_mc_init(&dec->mc_c, dec->pipe, dec->base.width, dec->base.height, BLOCK_HEIGHT, mc_scale))
 +      goto error_mc_c;
 +
 +   if (!init_pipe_state(dec))
 +      goto error_pipe_state;
 +
 +   return &dec->base;
 +
 +error_pipe_state:
 +   vl_mc_cleanup(&dec->mc_c);
 +
 +error_mc_c:
 +   vl_mc_cleanup(&dec->mc_y);
 +
 +error_mc_y:
 +   if (entrypoint <= PIPE_VIDEO_ENTRYPOINT_IDCT) {
 +      vl_idct_cleanup(&dec->idct_y);
 +      vl_idct_cleanup(&dec->idct_c);
 +   }
 +
 +error_idct:
 +   vl_zscan_cleanup(&dec->zscan_y);
 +   vl_zscan_cleanup(&dec->zscan_c);
 +
 +error_zscan:
 +   FREE(dec);
 +   return NULL;
 +}
index 487adddcb726e462ea34baf0345b9746fe1dbf01,a67e72e4f3515972f9d069742887d6d9b48180e3..f20d45f48de17256bf89a81057d8e83a5744c893
@@@ -371,9 -373,9 +373,10 @@@ static inline uint32_t r600_translate_c
                return V_028C70_SWAP_STD;
  
                /* 64-bit buffers. */
+       case PIPE_FORMAT_R32G32_FLOAT:
        case PIPE_FORMAT_R16G16B16A16_UNORM:
        case PIPE_FORMAT_R16G16B16A16_SNORM:
 +      case PIPE_FORMAT_R16G16B16A16_SSCALED:
        case PIPE_FORMAT_R16G16B16A16_FLOAT:
  
                /* 128-bit buffers. */
index 4a30eddb6211c27b58d3a7e7672f2699d7d8c852,d0d380392a07acf8bb7a1256ebb570de9e72fbe3..89b46f5ad7e78f85c4cc84239811173a4d91bf3d
@@@ -512,7 -662,9 +663,10 @@@ struct pipe_screen *r600_screen_create(
        rscreen->screen.get_paramf = r600_get_paramf;
        rscreen->screen.is_format_supported = r600_is_format_supported;
        rscreen->screen.context_create = r600_create_context;
 +      rscreen->screen.video_context_create = r600_video_create;
+       rscreen->screen.fence_reference = r600_fence_reference;
+       rscreen->screen.fence_signalled = r600_fence_signalled;
+       rscreen->screen.fence_finish = r600_fence_finish;
        r600_init_screen_resource_functions(&rscreen->screen);
  
        rscreen->tiling_info = r600_get_tiling_info(radeon);
index 2a40f41bbf553f51b6028297cac1a774b67a3971,5d6145661a060095eeb8153ae37ac36937dff812..5eabfdc2bc60b022572a600d32da5d663325d917
@@@ -366,9 -367,9 +368,10 @@@ static inline uint32_t r600_translate_c
                return V_0280A0_SWAP_STD;
  
                /* 64-bit buffers. */
+       case PIPE_FORMAT_R32G32_FLOAT:
        case PIPE_FORMAT_R16G16B16A16_UNORM:
        case PIPE_FORMAT_R16G16B16A16_SNORM:
 +      case PIPE_FORMAT_R16G16B16A16_SSCALED:
        case PIPE_FORMAT_R16G16B16A16_FLOAT:
  
                /* 128-bit buffers. */
Simple merge
index 542931ec1d894cbd57644379b1dbfe4d827b01fe,690e9344334f44a41f77ff5a6f9561bfe72fa1af..c9f75c019ef1df8bd4beb52d5ed9d2799877d3bd
@@@ -211,18 -211,24 +211,36 @@@ enum pipe_format 
     PIPE_FORMAT_LATC2_UNORM             = 145,
     PIPE_FORMAT_LATC2_SNORM             = 146,
  
-    PIPE_FORMAT_YV12                    = 147,
-    PIPE_FORMAT_YV16                    = 148,
-    PIPE_FORMAT_IYUV                    = 149,  /**< aka I420 */
-    PIPE_FORMAT_NV12                    = 150,
-    PIPE_FORMAT_NV21                    = 151,
+    PIPE_FORMAT_A8_SNORM                = 147,
+    PIPE_FORMAT_L8_SNORM                = 148,
+    PIPE_FORMAT_L8A8_SNORM              = 149,
+    PIPE_FORMAT_I8_SNORM                = 150,
+    PIPE_FORMAT_A16_SNORM               = 151,
+    PIPE_FORMAT_L16_SNORM               = 152,
+    PIPE_FORMAT_L16A16_SNORM            = 153,
+    PIPE_FORMAT_I16_SNORM               = 154,
+    PIPE_FORMAT_A16_FLOAT               = 155,
+    PIPE_FORMAT_L16_FLOAT               = 156,
+    PIPE_FORMAT_L16A16_FLOAT            = 157,
+    PIPE_FORMAT_I16_FLOAT               = 158,
+    PIPE_FORMAT_A32_FLOAT               = 159,
+    PIPE_FORMAT_L32_FLOAT               = 160,
+    PIPE_FORMAT_L32A32_FLOAT            = 161,
+    PIPE_FORMAT_I32_FLOAT               = 162,
++   PIPE_FORMAT_YV12                    = 163,
++   PIPE_FORMAT_YV16                    = 164,
++   PIPE_FORMAT_IYUV                    = 165,  /**< aka I420 */
++   PIPE_FORMAT_NV12                    = 166,
++   PIPE_FORMAT_NV21                    = 167,
 +   PIPE_FORMAT_AYUV                    = PIPE_FORMAT_A8R8G8B8_UNORM,
 +   PIPE_FORMAT_VUYA                    = PIPE_FORMAT_B8G8R8A8_UNORM,
 +   PIPE_FORMAT_XYUV                    = PIPE_FORMAT_X8R8G8B8_UNORM,
 +   PIPE_FORMAT_VUYX                    = PIPE_FORMAT_B8G8R8X8_UNORM,
-    PIPE_FORMAT_IA44                    = 152,
-    PIPE_FORMAT_AI44                    = 153,
++   PIPE_FORMAT_IA44                    = 168,
++   PIPE_FORMAT_AI44                    = 169,
 +
     PIPE_FORMAT_COUNT
  };
  
index 3d8637ab37ef08e8d6c470085f8c485e56b06c65,8e50dbda68504f184465d212ab68635a58c9de2a..bbaa84d7fdffbf040994f4f9f156863d9be2bb8d
@@@ -413,9 -509,42 +509,42 @@@ st_pipe_format_to_mesa_format(enum pipe
        return MESA_FORMAT_SIGNED_L_LATC1;
     case PIPE_FORMAT_LATC2_UNORM:
        return MESA_FORMAT_LA_LATC2;
 -   case PIPE_FORMAT_LATC2_SNORM:
 -      return MESA_FORMAT_SIGNED_LA_LATC2;
 +   //case PIPE_FORMAT_LATC2_SNORM:
 +   //   return MESA_FORMAT_SIGNED_LA_LATC2;
  
+    /* signed normalized formats */
+    case PIPE_FORMAT_R8_SNORM:
+       return MESA_FORMAT_SIGNED_R8;
+    case PIPE_FORMAT_R8G8_SNORM:
+       return MESA_FORMAT_SIGNED_RG88_REV;
+    case PIPE_FORMAT_R8G8B8A8_SNORM:
+       return MESA_FORMAT_SIGNED_RGBA8888_REV;
+    case PIPE_FORMAT_A8_SNORM:
+       return MESA_FORMAT_SIGNED_A8;
+    case PIPE_FORMAT_L8_SNORM:
+       return MESA_FORMAT_SIGNED_L8;
+    case PIPE_FORMAT_L8A8_SNORM:
+       return MESA_FORMAT_SIGNED_AL88;
+    case PIPE_FORMAT_I8_SNORM:
+       return MESA_FORMAT_SIGNED_I8;
+    case PIPE_FORMAT_R16_SNORM:
+       return MESA_FORMAT_SIGNED_R16;
+    case PIPE_FORMAT_R16G16_SNORM:
+       return MESA_FORMAT_SIGNED_GR1616;
+    case PIPE_FORMAT_R16G16B16A16_SNORM:
+       return MESA_FORMAT_SIGNED_RGBA_16;
+    case PIPE_FORMAT_A16_SNORM:
+       return MESA_FORMAT_SIGNED_A16;
+    case PIPE_FORMAT_L16_SNORM:
+       return MESA_FORMAT_SIGNED_L16;
+    case PIPE_FORMAT_L16A16_SNORM:
+       return MESA_FORMAT_SIGNED_AL1616;
+    case PIPE_FORMAT_I16_SNORM:
+       return MESA_FORMAT_SIGNED_I16;
     default:
        assert(0);
        return MESA_FORMAT_NONE;