X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Ffreedreno%2Fa3xx%2Ffd3_format.c;h=f8508977a78c79b89495d4864f342a3b56091d60;hb=5b2ef7853246b455f793417e5ae74e2a861afcae;hp=9b313b598a88a803a8df3ed44828c74facabda70;hpb=84d087aea29821a029aeefe76386d487e72d7287;p=mesa.git

diff --git a/src/gallium/drivers/freedreno/a3xx/fd3_format.c b/src/gallium/drivers/freedreno/a3xx/fd3_format.c
index 9b313b598a8..f8508977a78 100644
--- a/src/gallium/drivers/freedreno/a3xx/fd3_format.c
+++ b/src/gallium/drivers/freedreno/a3xx/fd3_format.c
@@ -275,6 +275,16 @@ static struct fd3_format formats[PIPE_FORMAT_COUNT] = {
 	_T(DXT3_SRGBA, DXT3, NONE, WZYX),
 	_T(DXT5_RGBA,  DXT5, NONE, WZYX),
 	_T(DXT5_SRGBA, DXT5, NONE, WZYX),
+
+	/* faked */
+	_T(RGTC1_UNORM, 8_8_8_8_UNORM, NONE, WZYX),
+	_T(RGTC1_SNORM, 8_8_8_8_SNORM, NONE, WZYX),
+	_T(RGTC2_UNORM, 8_8_8_8_UNORM, NONE, WZYX),
+	_T(RGTC2_SNORM, 8_8_8_8_SNORM, NONE, WZYX),
+	_T(LATC1_UNORM, 8_8_8_8_UNORM, NONE, WZYX),
+	_T(LATC1_SNORM, 8_8_8_8_SNORM, NONE, WZYX),
+	_T(LATC2_UNORM, 8_8_8_8_UNORM, NONE, WZYX),
+	_T(LATC2_SNORM, 8_8_8_8_SNORM, NONE, WZYX),
 };
 
 enum a3xx_vtx_fmt
@@ -314,6 +324,8 @@ fd3_pipe2fetchsize(enum pipe_format format)
 {
 	if (format == PIPE_FORMAT_Z32_FLOAT_S8X24_UINT)
 		format = PIPE_FORMAT_Z32_FLOAT;
+	else if (util_format_description(format)->layout == UTIL_FORMAT_LAYOUT_RGTC)
+		format = PIPE_FORMAT_R8G8B8A8_UNORM;
 	switch (util_format_get_blocksizebits(format) / util_format_get_blockwidth(format)) {
 	case 8: return TFETCH_1_BYTE;
 	case 16: return TFETCH_2_BYTE;
@@ -328,25 +340,12 @@ fd3_pipe2fetchsize(enum pipe_format format)
 	}
 }
 
-/* we need to special case a bit the depth/stencil restore, because we are
- * using the texture sampler to blit into the depth/stencil buffer, *not*
- * into a color buffer.  Otherwise fd3_tex_swiz() will do the wrong thing,
- * as it is assuming that you are sampling into normal render target..
- */
-enum pipe_format
-fd3_gmem_restore_format(enum pipe_format format)
+unsigned
+fd3_pipe2nblocksx(enum pipe_format format, unsigned width)
 {
-	switch (format) {
-	case PIPE_FORMAT_Z24X8_UNORM:
-	case PIPE_FORMAT_Z24_UNORM_S8_UINT:
-		return PIPE_FORMAT_R8G8B8A8_UNORM;
-	case PIPE_FORMAT_Z16_UNORM:
-		return PIPE_FORMAT_R8G8_UNORM;
-	case PIPE_FORMAT_S8_UINT:
-		return PIPE_FORMAT_R8_UNORM;
-	default:
-		return format;
-	}
+	if (util_format_description(format)->layout == UTIL_FORMAT_LAYOUT_RGTC)
+		format = PIPE_FORMAT_R8G8B8A8_UNORM;
+	return util_format_get_nblocksx(format, width);
 }
 
 enum a3xx_color_fmt
@@ -371,12 +370,12 @@ tex_swiz(unsigned swiz)
 {
 	switch (swiz) {
 	default:
-	case PIPE_SWIZZLE_RED:   return A3XX_TEX_X;
-	case PIPE_SWIZZLE_GREEN: return A3XX_TEX_Y;
-	case PIPE_SWIZZLE_BLUE:  return A3XX_TEX_Z;
-	case PIPE_SWIZZLE_ALPHA: return A3XX_TEX_W;
-	case PIPE_SWIZZLE_ZERO:  return A3XX_TEX_ZERO;
-	case PIPE_SWIZZLE_ONE:   return A3XX_TEX_ONE;
+	case PIPE_SWIZZLE_X: return A3XX_TEX_X;
+	case PIPE_SWIZZLE_Y: return A3XX_TEX_Y;
+	case PIPE_SWIZZLE_Z: return A3XX_TEX_Z;
+	case PIPE_SWIZZLE_W: return A3XX_TEX_W;
+	case PIPE_SWIZZLE_0: return A3XX_TEX_ZERO;
+	case PIPE_SWIZZLE_1: return A3XX_TEX_ONE;
 	}
 }