Fix build

2 files changed, 20 insertions, 18 deletions

diff --git a/Makefile.in b/Makefile.in
index 6a41961..8cca095 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -12,12 +12,14 @@ LDFLAGS     = @LDFLAGS@ @GTK_LIBS@ $(MESA_LIBS)
 
 # Makefile hardcoded
 MESA_INCLUDES = \
+	-I$(MESA)/include \
 	-I$(MESA)src/gallium/include \
 	-I$(MESA)src/gallium/auxiliary \
 	-I$(MESA)src/gallium/drivers
 
 MESA_LIBS     = \
-	$(MESA)src/gallium/auxiliary/libgallium.a
+	-lm -ldl \
+	$(MESA)/src/gallium/auxiliary/.libs/libgallium.a
 
 TARGET  := rbug-gui
 ODIR    := .obj
diff --git a/src/texture.c b/src/texture.c
index 6fcb0ad..659d0de 100644
--- a/src/texture.c
+++ b/src/texture.c
@@ -472,11 +472,11 @@ static gboolean texture_action_read_info(struct rbug_event *e,
 	case PIPE_FORMAT_Z16_UNORM:		buf = icon_get("z", p); break;
 	case PIPE_FORMAT_Z32_UNORM:		buf = icon_get("z", p); break;
 	case PIPE_FORMAT_Z32_FLOAT:		buf = icon_get("z", p); break;
-	case PIPE_FORMAT_Z24_UNORM_S8_USCALED:	buf = icon_get("s8z24", p); break;
-	case PIPE_FORMAT_S8_USCALED_Z24_UNORM:	buf = icon_get("z24s8", p); break;
+	case PIPE_FORMAT_Z24_UNORM_S8_UINT:	buf = icon_get("s8z24", p); break;
+	case PIPE_FORMAT_S8_UINT_Z24_UNORM:	buf = icon_get("z24s8", p); break;
 	case PIPE_FORMAT_Z24X8_UNORM:		buf = icon_get("x8z24", p); break;
 	case PIPE_FORMAT_X8Z24_UNORM:		buf = icon_get("z24x8", p); break;
-	case PIPE_FORMAT_S8_USCALED:		buf = icon_get("s", p); break;
+	case PIPE_FORMAT_S8_UINT:		buf = icon_get("s", p); break;
 	case PIPE_FORMAT_R64_FLOAT:		buf = icon_get("r", p); break;
 	case PIPE_FORMAT_R64G64_FLOAT:		buf = icon_get("rg", p); break;
 	case PIPE_FORMAT_R64G64B64_FLOAT:	buf = icon_get("rgb", p); break;
@@ -489,10 +489,10 @@ static gboolean texture_action_read_info(struct rbug_event *e,
 	case PIPE_FORMAT_R32G32_UNORM:		buf = icon_get("rg", p); break;
 	case PIPE_FORMAT_R32G32B32_UNORM:	buf = icon_get("rgb", p); break;
 	case PIPE_FORMAT_R32G32B32A32_UNORM:	buf = icon_get("rgba", p); break;
-	case PIPE_FORMAT_R32_USCALED:		buf = icon_get("r", p); break;
-	case PIPE_FORMAT_R32G32_USCALED:	buf = icon_get("rg", p); break;
-	case PIPE_FORMAT_R32G32B32_USCALED:	buf = icon_get("rgb", p); break;
-	case PIPE_FORMAT_R32G32B32A32_USCALED:	buf = icon_get("rgba", p); break;
+	case PIPE_FORMAT_R32_UINT:		buf = icon_get("r", p); break;
+	case PIPE_FORMAT_R32G32_UINT:		buf = icon_get("rg", p); break;
+	case PIPE_FORMAT_R32G32B32_UINT:	buf = icon_get("rgb", p); break;
+	case PIPE_FORMAT_R32G32B32A32_UINT:	buf = icon_get("rgba", p); break;
 	case PIPE_FORMAT_R32_SNORM:		buf = icon_get("r", p); break;
 	case PIPE_FORMAT_R32G32_SNORM:		buf = icon_get("rg", p); break;
 	case PIPE_FORMAT_R32G32B32_SNORM:	buf = icon_get("rgb", p); break;
@@ -505,10 +505,10 @@ static gboolean texture_action_read_info(struct rbug_event *e,
 	case PIPE_FORMAT_R16G16_UNORM:		buf = icon_get("rg", p); break;
 	case PIPE_FORMAT_R16G16B16_UNORM:	buf = icon_get("rgb", p); break;
 	case PIPE_FORMAT_R16G16B16A16_UNORM:	buf = icon_get("rgba", p); break;
-	case PIPE_FORMAT_R16_USCALED:		buf = icon_get("r", p); break;
-	case PIPE_FORMAT_R16G16_USCALED:	buf = icon_get("rg", p); break;
-	case PIPE_FORMAT_R16G16B16_USCALED:	buf = icon_get("rgb", p); break;
-	case PIPE_FORMAT_R16G16B16A16_USCALED:	buf = icon_get("rgba", p); break;
+	case PIPE_FORMAT_R16_UINT:		buf = icon_get("r", p); break;
+	case PIPE_FORMAT_R16G16_UINT:		buf = icon_get("rg", p); break;
+	case PIPE_FORMAT_R16G16B16_UINT:	buf = icon_get("rgb", p); break;
+	case PIPE_FORMAT_R16G16B16A16_UINT:	buf = icon_get("rgba", p); break;
 	case PIPE_FORMAT_R16_SNORM:		buf = icon_get("r", p); break;
 	case PIPE_FORMAT_R16G16_SNORM:		buf = icon_get("rg", p); break;
 	case PIPE_FORMAT_R16G16B16_SNORM:	buf = icon_get("rgb", p); break;
@@ -522,10 +522,10 @@ static gboolean texture_action_read_info(struct rbug_event *e,
 	case PIPE_FORMAT_R8G8B8_UNORM:		buf = icon_get("rgb", p); break;
 	case PIPE_FORMAT_R8G8B8A8_UNORM:	buf = icon_get("rgba", p); break;
 	case PIPE_FORMAT_X8B8G8R8_UNORM:	buf = icon_get("xbgr", p); break;
-	case PIPE_FORMAT_R8_USCALED:		buf = icon_get("r", p); break;
-	case PIPE_FORMAT_R8G8_USCALED:		buf = icon_get("rg", p); break;
-	case PIPE_FORMAT_R8G8B8_USCALED:	buf = icon_get("rgb", p); break;
-	case PIPE_FORMAT_R8G8B8A8_USCALED:	buf = icon_get("rgba", p); break;
+	case PIPE_FORMAT_R8_UINT:		buf = icon_get("r", p); break;
+	case PIPE_FORMAT_R8G8_UINT:		buf = icon_get("rg", p); break;
+	case PIPE_FORMAT_R8G8B8_UINT:		buf = icon_get("rgb", p); break;
+	case PIPE_FORMAT_R8G8B8A8_UINT:		buf = icon_get("rgba", p); break;
 	case PIPE_FORMAT_R8_SNORM:		buf = icon_get("r", p); break;
 	case PIPE_FORMAT_R8G8_SNORM:		buf = icon_get("rg", p); break;
 	case PIPE_FORMAT_R8G8B8_SNORM:		buf = icon_get("rgb", p); break;
@@ -583,10 +583,10 @@ static gboolean texture_action_read_info(struct rbug_event *e,
 	/* TODO: re-order these */
 	case PIPE_FORMAT_A8B8G8R8_UNORM: break;
 	case PIPE_FORMAT_B5G5R5X1_UNORM: break;
-	case PIPE_FORMAT_R10G10B10A2_USCALED: break;
+	case PIPE_FORMAT_R10G10B10A2_UINT: break;
 	case PIPE_FORMAT_R11G11B10_FLOAT: break;
 	case PIPE_FORMAT_R9G9B9E5_FLOAT: break;
-	case PIPE_FORMAT_Z32_FLOAT_S8X24_USCALED: break;
+	case PIPE_FORMAT_Z32_FLOAT_S8X24_UINT: break;
 	case PIPE_FORMAT_R1_UNORM: break;
 	case PIPE_FORMAT_R10G10B10X2_USCALED: break;
 	case PIPE_FORMAT_R10G10B10X2_SNORM: break;