Import Mesa 11.2.2

4 files changed, 2 insertions, 50 deletions

diff --git a/lib/mesa/src/compiler/SConscript b/lib/mesa/src/compiler/SConscript
index 0a0c07374..8d71b82be 100644
--- a/lib/mesa/src/compiler/SConscript
+++ b/lib/mesa/src/compiler/SConscript
@@ -13,10 +13,6 @@ env.Prepend(CPPPATH = [
     '#src/gallium/auxiliary',
 ])
 
-# Make generated headers reachable from the include path.
-env.Prepend(CPPPATH = [Dir('.').abspath, Dir('glsl').abspath])
-env.Prepend(CPPPATH = [Dir('.').abspath, Dir('nir').abspath])
-
 sources = env.ParseSourceList('Makefile.sources', 'LIBCOMPILER_FILES')
 
 compiler = env.ConvenienceLibrary(
@@ -25,6 +21,4 @@ compiler = env.ConvenienceLibrary(
 )
 Export('compiler')
 
-SConscript('SConscript.glsl')
-SConscript('SConscript.nir')
-SConscript('SConscript.spirv')
+SConscript('glsl/SConscript')
diff --git a/lib/mesa/src/gallium/auxiliary/pipe-loader/SConscript b/lib/mesa/src/gallium/auxiliary/pipe-loader/SConscript
index 0f72195b2..14e1b350a 100644
--- a/lib/mesa/src/gallium/auxiliary/pipe-loader/SConscript
+++ b/lib/mesa/src/gallium/auxiliary/pipe-loader/SConscript
@@ -7,7 +7,6 @@ env.MSVC2013Compat()
 env.Append(CPPPATH = [
     '#/src/loader',
     '#/src/gallium/winsys',
-    xmlpool_options.dir.dir,
 ])
 
 env.Append(CPPDEFINES = [
diff --git a/lib/mesa/src/gallium/include/state_tracker/sw_driver.h b/lib/mesa/src/gallium/include/state_tracker/sw_driver.h
index 1d59bd5fe..0eb2b44d6 100644
--- a/lib/mesa/src/gallium/include/state_tracker/sw_driver.h
+++ b/lib/mesa/src/gallium/include/state_tracker/sw_driver.h
@@ -16,6 +16,6 @@ struct sw_driver_descriptor
    } winsys[];
 };
 
-extern const struct sw_driver_descriptor swrast_driver_descriptor;
+extern struct sw_driver_descriptor swrast_driver_descriptor;
 
 #endif
diff --git a/lib/mesa/src/gallium/winsys/virgl/vtest/vtest_protocol.h b/lib/mesa/src/gallium/winsys/virgl/vtest/vtest_protocol.h
index 9360213ac..86d197f00 100644
--- a/lib/mesa/src/gallium/winsys/virgl/vtest/vtest_protocol.h
+++ b/lib/mesa/src/gallium/winsys/virgl/vtest/vtest_protocol.h
@@ -24,7 +24,6 @@
 #define VTEST_PROTOCOL
 
 #define VTEST_DEFAULT_SOCKET_NAME "/tmp/.virgl_test"
-#define VTEST_PROTOCOL_VERSION 2
 
 /* 32-bit length field */
 /* 32-bit cmd field */
@@ -48,20 +47,10 @@
 
 /* pass the process cmd line for debugging */
 #define VCMD_CREATE_RENDERER 8
-
-#define VCMD_GET_CAPS2 9
 /* get caps */
 /* 0 length cmd */
 /* resp VCMD_GET_CAPS + caps */
 
-#define VCMD_PING_PROTOCOL_VERSION 10
-
-#define VCMD_PROTOCOL_VERSION 11
-
-#define VCMD_RESOURCE_CREATE2 12
-#define VCMD_TRANSFER_GET2 13
-#define VCMD_TRANSFER_PUT2 14
-
 #define VCMD_RES_CREATE_SIZE 10
 #define VCMD_RES_CREATE_RES_HANDLE 0
 #define VCMD_RES_CREATE_TARGET 1
@@ -74,19 +63,6 @@
 #define VCMD_RES_CREATE_LAST_LEVEL 8
 #define VCMD_RES_CREATE_NR_SAMPLES 9
 
-#define VCMD_RES_CREATE2_SIZE 11
-#define VCMD_RES_CREATE2_RES_HANDLE 0
-#define VCMD_RES_CREATE2_TARGET 1
-#define VCMD_RES_CREATE2_FORMAT 2
-#define VCMD_RES_CREATE2_BIND 3
-#define VCMD_RES_CREATE2_WIDTH 4
-#define VCMD_RES_CREATE2_HEIGHT 5
-#define VCMD_RES_CREATE2_DEPTH 6
-#define VCMD_RES_CREATE2_ARRAY_SIZE 7
-#define VCMD_RES_CREATE2_LAST_LEVEL 8
-#define VCMD_RES_CREATE2_NR_SAMPLES 9
-#define VCMD_RES_CREATE2_DATA_SIZE 10
-
 #define VCMD_RES_UNREF_SIZE 1
 #define VCMD_RES_UNREF_RES_HANDLE 0
 
@@ -103,27 +79,10 @@
 #define VCMD_TRANSFER_DEPTH 9
 #define VCMD_TRANSFER_DATA_SIZE 10
 
-#define VCMD_TRANSFER2_HDR_SIZE 10
-#define VCMD_TRANSFER2_RES_HANDLE 0
-#define VCMD_TRANSFER2_LEVEL 1
-#define VCMD_TRANSFER2_X 2
-#define VCMD_TRANSFER2_Y 3
-#define VCMD_TRANSFER2_Z 4
-#define VCMD_TRANSFER2_WIDTH 5
-#define VCMD_TRANSFER2_HEIGHT 6
-#define VCMD_TRANSFER2_DEPTH 7
-#define VCMD_TRANSFER2_DATA_SIZE 8
-#define VCMD_TRANSFER2_OFFSET 9
-
 #define VCMD_BUSY_WAIT_FLAG_WAIT 1
 
 #define VCMD_BUSY_WAIT_SIZE 2
 #define VCMD_BUSY_WAIT_HANDLE 0
 #define VCMD_BUSY_WAIT_FLAGS 1
 
-#define VCMD_PING_PROTOCOL_VERSION_SIZE 1
-
-#define VCMD_PROTOCOL_VERSION_SIZE 1
-#define VCMD_PROTOCOL_VERSION_VERSION 0
-
 #endif