summaryrefslogtreecommitdiffstats
path: root/src/mesa/swrast/s_texfetch.c
diff options
context:
space:
mode:
authorMark Mueller <[email protected]>2014-01-21 22:37:20 -0800
committerMark Mueller <[email protected]>2014-01-27 14:34:04 -0800
commitf5bd5568abcc234c1c2b6a4bb67b880706f3caed (patch)
treed970e8373b860592a32e34070c4f95d2d3433da6 /src/mesa/swrast/s_texfetch.c
parent8b47b6bc32b595ee1a37cde279d44a6ac84403c0 (diff)
mesa: Fix Type A _INT formats to MESA_FORMAT naming standard
Replace Type A _INT formats names with _SINT to match naming spec, and update type C formats as follows: s/MESA_FORMAT_R_INT8\b/MESA_FORMAT_R_SINT8/g s/MESA_FORMAT_R_INT16\b/MESA_FORMAT_R_SINT16/g s/MESA_FORMAT_R_INT32\b/MESA_FORMAT_R_SINT32/g s/MESA_FORMAT_RG_INT8\b/MESA_FORMAT_RG_SINT8/g s/MESA_FORMAT_RG_INT16\b/MESA_FORMAT_RG_SINT16/g s/MESA_FORMAT_RG_INT32\b/MESA_FORMAT_RG_SINT32/g s/MESA_FORMAT_RGB_INT8\b/MESA_FORMAT_RGB_SINT8/g s/MESA_FORMAT_RGB_INT16\b/MESA_FORMAT_RGB_SINT16/g s/MESA_FORMAT_RGB_INT32\b/MESA_FORMAT_RGB_SINT32/g s/MESA_FORMAT_RGBA_INT8\b/MESA_FORMAT_RGBA_SINT8/g s/MESA_FORMAT_RGBA_INT16\b/MESA_FORMAT_RGBA_SINT16/g s/MESA_FORMAT_RGBA_INT32\b/MESA_FORMAT_RGBA_SINT32/g s/\bMESA_FORMAT_RED_RGTC1\b/MESA_FORMAT_R_RGTC1_UNORM/g s/\bMESA_FORMAT_SIGNED_RED_RGTC1\b/MESA_FORMAT_R_RGTC1_SNORM/g s/\bMESA_FORMAT_RG_RGTC2\b/MESA_FORMAT_RG_RGTC2_UNORM/g s/\bMESA_FORMAT_SIGNED_RG_RGTC2\b/MESA_FORMAT_RG_RGTC2_SNORM/g s/\bMESA_FORMAT_L_LATC1\b/MESA_FORMAT_L_LATC1_UNORM/g s/\bMESA_FORMAT_SIGNED_L_LATC1\b/MESA_FORMAT_L_LATC1_SNORM/g s/\bMESA_FORMAT_LA_LATC2\b/MESA_FORMAT_LA_LATC2_UNORM/g s/\bMESA_FORMAT_SIGNED_LA_LATC2\b/MESA_FORMAT_LA_LATC2_SNORM/g
Diffstat (limited to 'src/mesa/swrast/s_texfetch.c')
-rw-r--r--src/mesa/swrast/s_texfetch.c40
1 files changed, 20 insertions, 20 deletions
diff --git a/src/mesa/swrast/s_texfetch.c b/src/mesa/swrast/s_texfetch.c
index a6aae909bb0..7a3e76f851b 100644
--- a/src/mesa/swrast/s_texfetch.c
+++ b/src/mesa/swrast/s_texfetch.c
@@ -779,21 +779,21 @@ texfetch_funcs[] =
{
- MESA_FORMAT_R_INT8,
+ MESA_FORMAT_R_SINT8,
NULL,
NULL,
NULL
},
{
- MESA_FORMAT_RG_INT8,
+ MESA_FORMAT_RG_SINT8,
NULL,
NULL,
NULL
},
{
- MESA_FORMAT_RGB_INT8,
+ MESA_FORMAT_RGB_SINT8,
NULL,
NULL,
NULL
@@ -801,55 +801,55 @@ texfetch_funcs[] =
/* non-normalized, signed int */
{
- MESA_FORMAT_RGBA_INT8,
+ MESA_FORMAT_RGBA_SINT8,
fetch_texel_1d_rgba_int8,
fetch_texel_2d_rgba_int8,
fetch_texel_3d_rgba_int8
},
{
- MESA_FORMAT_R_INT16,
+ MESA_FORMAT_R_SINT16,
NULL,
NULL,
NULL
},
{
- MESA_FORMAT_RG_INT16,
+ MESA_FORMAT_RG_SINT16,
NULL,
NULL,
NULL
},
{
- MESA_FORMAT_RGB_INT16,
+ MESA_FORMAT_RGB_SINT16,
NULL,
NULL,
NULL
},
{
- MESA_FORMAT_RGBA_INT16,
+ MESA_FORMAT_RGBA_SINT16,
fetch_texel_1d_rgba_int16,
fetch_texel_2d_rgba_int16,
fetch_texel_3d_rgba_int16
},
{
- MESA_FORMAT_R_INT32,
+ MESA_FORMAT_R_SINT32,
NULL,
NULL,
NULL
},
{
- MESA_FORMAT_RG_INT32,
+ MESA_FORMAT_RG_SINT32,
NULL,
NULL,
NULL
},
{
- MESA_FORMAT_RGB_INT32,
+ MESA_FORMAT_RGB_SINT32,
NULL,
NULL,
NULL
},
{
- MESA_FORMAT_RGBA_INT32,
+ MESA_FORMAT_RGBA_SINT32,
fetch_texel_1d_rgba_int32,
fetch_texel_2d_rgba_int32,
fetch_texel_3d_rgba_int32
@@ -999,49 +999,49 @@ texfetch_funcs[] =
fetch_texel_3d_rgba_16
},
{
- MESA_FORMAT_RED_RGTC1,
+ MESA_FORMAT_R_RGTC1_UNORM,
fetch_compressed,
fetch_compressed,
fetch_compressed
},
{
- MESA_FORMAT_SIGNED_RED_RGTC1,
+ MESA_FORMAT_R_RGTC1_SNORM,
fetch_compressed,
fetch_compressed,
fetch_compressed
},
{
- MESA_FORMAT_RG_RGTC2,
+ MESA_FORMAT_RG_RGTC2_UNORM,
fetch_compressed,
fetch_compressed,
fetch_compressed
},
{
- MESA_FORMAT_SIGNED_RG_RGTC2,
+ MESA_FORMAT_RG_RGTC2_SNORM,
fetch_compressed,
fetch_compressed,
fetch_compressed
},
{
- MESA_FORMAT_L_LATC1,
+ MESA_FORMAT_L_LATC1_UNORM,
fetch_compressed,
fetch_compressed,
fetch_compressed
},
{
- MESA_FORMAT_SIGNED_L_LATC1,
+ MESA_FORMAT_L_LATC1_SNORM,
fetch_compressed,
fetch_compressed,
fetch_compressed
},
{
- MESA_FORMAT_LA_LATC2,
+ MESA_FORMAT_LA_LATC2_UNORM,
fetch_compressed,
fetch_compressed,
fetch_compressed
},
{
- MESA_FORMAT_SIGNED_LA_LATC2,
+ MESA_FORMAT_LA_LATC2_SNORM,
fetch_compressed,
fetch_compressed,
fetch_compressed