Merge Mesa 18.3.2

1 files changed, 21 insertions, 0 deletions

diff --git a/lib/mesa/src/gallium/drivers/nouveau/nvc0/mme/com9097.mme.h b/lib/mesa/src/gallium/drivers/nouveau/nvc0/mme/com9097.mme.h
index 9618da6e2..49c089111 100644
--- a/lib/mesa/src/gallium/drivers/nouveau/nvc0/mme/com9097.mme.h
+++ b/lib/mesa/src/gallium/drivers/nouveau/nvc0/mme/com9097.mme.h
@@ -373,3 +373,24 @@ uint32_t mme9097_query_buffer_write[] = {
 	0x840100c2,
 	0x00110071,
 };
+
+uint32_t mme9097_conservative_raster_state[] = {
+	0x07400021,
+	0x00000041,
+	0xb8d04042,
+/* 0x000c: crs_loop */
+	0x0001c211,
+	0xb8c08042,
+	0x06310021,
+	0x020c4211,
+	0x5b008042,
+	0x01004212,
+	0x41085212,
+	0x20a1c021,
+	0x00040311,
+	0xffffdb11,
+	0xffffd817,
+	0x00001041,
+	0x051480a1,
+	0x00004041,
+};