Format layout cannot be used to distinguish scaled/normalised formats.

1 files changed, 4 insertions, 14 deletions

diff --git a/src/gallium/drivers/nv50/nv50_vbo.c b/src/gallium/drivers/nv50/nv50_vbo.c
index f3472f266e..d1c9f3f590 100644
--- a/src/gallium/drivers/nv50/nv50_vbo.c
+++ b/src/gallium/drivers/nv50/nv50_vbo.c
@@ -75,25 +75,15 @@ nv50_vbo_type_to_hw(enum pipe_format format)
 	case UTIL_FORMAT_TYPE_FLOAT:
 		return NV50TCL_VERTEX_ARRAY_ATTRIB_TYPE_FLOAT;
 	case UTIL_FORMAT_TYPE_UNSIGNED:
-		switch (desc->layout) {
-		case UTIL_FORMAT_LAYOUT_ARITH:
+		if (desc->channel[0].normalized) {
 			return NV50TCL_VERTEX_ARRAY_ATTRIB_TYPE_UNORM;
-		case UTIL_FORMAT_LAYOUT_ARRAY:
-			return NV50TCL_VERTEX_ARRAY_ATTRIB_TYPE_USCALED;
-		default:
-			return 0;
 		}
-		break;
+		return NV50TCL_VERTEX_ARRAY_ATTRIB_TYPE_USCALED;
 	case UTIL_FORMAT_TYPE_SIGNED:
-		switch (desc->layout) {
-		case UTIL_FORMAT_LAYOUT_ARITH:
+		if (desc->channel[0].normalized) {
 			return NV50TCL_VERTEX_ARRAY_ATTRIB_TYPE_SNORM;
-		case UTIL_FORMAT_LAYOUT_ARRAY:
-			return NV50TCL_VERTEX_ARRAY_ATTRIB_TYPE_SSCALED;
-		default:
-			return 0;
 		}
-		break;
+		return NV50TCL_VERTEX_ARRAY_ATTRIB_TYPE_SSCALED;
 	/*
 	case PIPE_FORMAT_TYPE_UINT:
 		return NV50TCL_VERTEX_ARRAY_ATTRIB_TYPE_UINT;