summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/mesa/swrast/s_texfetch.c6
-rw-r--r--src/mesa/swrast/s_texfetch_tmp.h13
2 files changed, 16 insertions, 3 deletions
diff --git a/src/mesa/swrast/s_texfetch.c b/src/mesa/swrast/s_texfetch.c
index 3ad4a5b86c6..098a32fd4be 100644
--- a/src/mesa/swrast/s_texfetch.c
+++ b/src/mesa/swrast/s_texfetch.c
@@ -325,9 +325,9 @@ texfetch_funcs[] =
},
{
MESA_FORMAT_R10G10B10A2_UNORM,
- NULL,
- NULL,
- NULL
+ fetch_texel_1d_R10G10B10A2_UNORM,
+ fetch_texel_2d_R10G10B10A2_UNORM,
+ fetch_texel_3d_R10G10B10A2_UNORM
},
{
MESA_FORMAT_S8_UINT_Z24_UNORM,
diff --git a/src/mesa/swrast/s_texfetch_tmp.h b/src/mesa/swrast/s_texfetch_tmp.h
index b1981e4d332..c783ae34f1c 100644
--- a/src/mesa/swrast/s_texfetch_tmp.h
+++ b/src/mesa/swrast/s_texfetch_tmp.h
@@ -503,6 +503,19 @@ FETCH(B10G10R10A2_UNORM)(const struct swrast_texture_image *texImage,
static void
+FETCH(R10G10B10A2_UNORM)(const struct swrast_texture_image *texImage,
+ GLint i, GLint j, GLint k, GLfloat *texel)
+{
+ const GLuint *src = TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
+ const GLuint s = *src;
+ texel[RCOMP] = ((s >> 0) & 0x3ff) * (1.0F / 1023.0F);
+ texel[GCOMP] = ((s >> 10) & 0x3ff) * (1.0F / 1023.0F);
+ texel[BCOMP] = ((s >> 20) & 0x3ff) * (1.0F / 1023.0F);
+ texel[ACOMP] = ((s >> 30) & 0x03) * (1.0F / 3.0F);
+}
+
+
+static void
FETCH(R8G8_UNORM)(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel)
{