From bf059ebd33b4654334c1d96b6022fd6eef278782 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 5 Oct 2011 13:35:33 -0600
Subject: [PATCH] swrast: update texfetch_funcs table for new int/uint formats

This only adds dummy entries to the table to fix failed assertions.
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=41491
---
 src/mesa/swrast/s_texfetch.c | 325 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 325 insertions(+)

diff --git a/src/mesa/swrast/s_texfetch.c b/src/mesa/swrast/s_texfetch.c
index 73b5af3..7573abd 100644
--- a/src/mesa/swrast/s_texfetch.c
+++ b/src/mesa/swrast/s_texfetch.c
@@ -656,6 +656,226 @@ texfetch_funcs[MESA_FORMAT_COUNT] =
       store_texel_rg_f16
    },
 
+   {
+      MESA_FORMAT_ALPHA_UINT8,
+      NULL,
+      NULL,
+      NULL,
+      NULL
+   },
+
+   {
+      MESA_FORMAT_ALPHA_UINT16,
+      NULL,
+      NULL,
+      NULL,
+      NULL
+   },
+
+   {
+      MESA_FORMAT_ALPHA_UINT32,
+      NULL,
+      NULL,
+      NULL,
+      NULL
+   },
+
+   {
+      MESA_FORMAT_ALPHA_INT8,
+      NULL,
+      NULL,
+      NULL,
+      NULL
+   },
+
+   {
+      MESA_FORMAT_ALPHA_INT16,
+      NULL,
+      NULL,
+      NULL,
+      NULL
+   },
+
+   {
+      MESA_FORMAT_ALPHA_INT32,
+      NULL,
+      NULL,
+      NULL,
+      NULL
+   },
+
+
+   {
+      MESA_FORMAT_INTENSITY_UINT8,
+      NULL,
+      NULL,
+      NULL,
+      NULL
+   },
+
+   {
+      MESA_FORMAT_INTENSITY_UINT16,
+      NULL,
+      NULL,
+      NULL,
+      NULL
+   },
+
+   {
+      MESA_FORMAT_INTENSITY_UINT32,
+      NULL,
+      NULL,
+      NULL,
+      NULL
+   },
+
+   {
+      MESA_FORMAT_INTENSITY_INT8,
+      NULL,
+      NULL,
+      NULL,
+      NULL
+   },
+
+   {
+      MESA_FORMAT_INTENSITY_INT16,
+      NULL,
+      NULL,
+      NULL,
+      NULL
+   },
+
+   {
+      MESA_FORMAT_INTENSITY_INT32,
+      NULL,
+      NULL,
+      NULL,
+      NULL
+   },
+
+
+   {
+      MESA_FORMAT_LUMINANCE_UINT8,
+      NULL,
+      NULL,
+      NULL,
+      NULL
+   },
+
+   {
+      MESA_FORMAT_LUMINANCE_UINT16,
+      NULL,
+      NULL,
+      NULL,
+      NULL
+   },
+
+   {
+      MESA_FORMAT_LUMINANCE_UINT32,
+      NULL,
+      NULL,
+      NULL,
+      NULL
+   },
+
+   {
+      MESA_FORMAT_LUMINANCE_INT8,
+      NULL,
+      NULL,
+      NULL,
+      NULL
+   },
+
+   {
+      MESA_FORMAT_LUMINANCE_INT16,
+      NULL,
+      NULL,
+      NULL,
+      NULL
+   },
+
+   {
+      MESA_FORMAT_LUMINANCE_INT32,
+      NULL,
+      NULL,
+      NULL,
+      NULL
+   },
+
+
+   {
+      MESA_FORMAT_LUMINANCE_ALPHA_UINT8,
+      NULL,
+      NULL,
+      NULL,
+      NULL
+   },
+
+   {
+      MESA_FORMAT_LUMINANCE_ALPHA_UINT16,
+      NULL,
+      NULL,
+      NULL,
+      NULL
+   },
+
+   {
+      MESA_FORMAT_LUMINANCE_ALPHA_UINT32,
+      NULL,
+      NULL,
+      NULL,
+      NULL
+   },
+
+   {
+      MESA_FORMAT_LUMINANCE_ALPHA_INT8,
+      NULL,
+      NULL,
+      NULL,
+      NULL
+   },
+
+   {
+      MESA_FORMAT_LUMINANCE_ALPHA_INT16,
+      NULL,
+      NULL,
+      NULL,
+      NULL
+   },
+
+   {
+      MESA_FORMAT_LUMINANCE_ALPHA_INT32,
+      NULL,
+      NULL,
+      NULL,
+      NULL
+   },
+
+
+   {
+      MESA_FORMAT_R_INT8,
+      NULL,
+      NULL,
+      NULL,
+      NULL
+   },
+
+   {
+      MESA_FORMAT_RG_INT8,
+      NULL,
+      NULL,
+      NULL,
+      NULL
+   },
+
+   {
+      MESA_FORMAT_RGB_INT8,
+      NULL,
+      NULL,
+      NULL,
+      NULL
+   },
+
    /* non-normalized, signed int */
    {
       MESA_FORMAT_RGBA_INT8,
@@ -665,6 +885,27 @@ texfetch_funcs[MESA_FORMAT_COUNT] =
       store_texel_rgba_int8
    },
    {
+      MESA_FORMAT_R_INT16,
+      NULL,
+      NULL,
+      NULL,
+      NULL
+   },
+   {
+      MESA_FORMAT_RG_INT16,
+      NULL,
+      NULL,
+      NULL,
+      NULL
+   },
+   {
+      MESA_FORMAT_RGB_INT16,
+      NULL,
+      NULL,
+      NULL,
+      NULL
+   },
+   {
       MESA_FORMAT_RGBA_INT16,
       fetch_texel_1d_rgba_int16,
       fetch_texel_2d_rgba_int16,
@@ -672,6 +913,27 @@ texfetch_funcs[MESA_FORMAT_COUNT] =
       store_texel_rgba_int16
    },
    {
+      MESA_FORMAT_R_INT32,
+      NULL,
+      NULL,
+      NULL,
+      NULL
+   },
+   {
+      MESA_FORMAT_RG_INT32,
+      NULL,
+      NULL,
+      NULL,
+      NULL
+   },
+   {
+      MESA_FORMAT_RGB_INT32,
+      NULL,
+      NULL,
+      NULL,
+      NULL
+   },
+   {
       MESA_FORMAT_RGBA_INT32,
       fetch_texel_1d_rgba_int32,
       fetch_texel_2d_rgba_int32,
@@ -681,6 +943,27 @@ texfetch_funcs[MESA_FORMAT_COUNT] =
 
    /* non-normalized, unsigned int */
    {
+      MESA_FORMAT_R_UINT8,
+      NULL,
+      NULL,
+      NULL,
+      NULL
+   },
+   {
+      MESA_FORMAT_RG_UINT8,
+      NULL,
+      NULL,
+      NULL,
+      NULL
+   },
+   {
+      MESA_FORMAT_RGB_UINT8,
+      NULL,
+      NULL,
+      NULL,
+      NULL
+   },
+   {
       MESA_FORMAT_RGBA_UINT8,
       fetch_texel_1d_rgba_uint8,
       fetch_texel_2d_rgba_uint8,
@@ -688,6 +971,27 @@ texfetch_funcs[MESA_FORMAT_COUNT] =
       store_texel_rgba_uint8
    },
    {
+      MESA_FORMAT_R_UINT16,
+      NULL,
+      NULL,
+      NULL,
+      NULL
+   },
+   {
+      MESA_FORMAT_RG_UINT16,
+      NULL,
+      NULL,
+      NULL,
+      NULL
+   },
+   {
+      MESA_FORMAT_RGB_UINT16,
+      NULL,
+      NULL,
+      NULL,
+      NULL
+   },
+   {
       MESA_FORMAT_RGBA_UINT16,
       fetch_texel_1d_rgba_uint16,
       fetch_texel_2d_rgba_uint16,
@@ -695,6 +999,27 @@ texfetch_funcs[MESA_FORMAT_COUNT] =
       store_texel_rgba_uint16
    },
    {
+      MESA_FORMAT_R_UINT32,
+      NULL,
+      NULL,
+      NULL,
+      NULL
+   },
+   {
+      MESA_FORMAT_RG_UINT32,
+      NULL,
+      NULL,
+      NULL,
+      NULL
+   },
+   {
+      MESA_FORMAT_RGB_UINT32,
+      NULL,
+      NULL,
+      NULL,
+      NULL
+   },
+   {
       MESA_FORMAT_RGBA_UINT32,
       fetch_texel_1d_rgba_uint32,
       fetch_texel_2d_rgba_uint32,
-- 
2.7.4