Fix build with mesa 10.1.

Mesa renamed some constants and a directory.

Signed-off-by: Abrahm Scully <abrahm.scully@gmail.com>
Reviewed-by: Zhigang Gong <zhigang.gong@linux.intel.com>

diff --git a/CMake/FindMesaSrc.cmake b/CMake/FindMesaSrc.cmake
index c1d4fc6..978cb4e 100644 (file)
--- a/CMake/FindMesaSrc.cmake
+++ b/CMake/FindMesaSrc.cmake
@@ -18,7 +18,7 @@ SET(MESA_SOURCE_INCLUDES ${MESA_SOURCE_PREFIX}/src/mesa
                          ${MESA_SOURCE_PREFIX}/include
                          ${MESA_SOURCE_PREFIX}/src/mapi
                          ${MESA_SOURCE_PREFIX}/src/mesa/drivers/dri/i965/
-                         ${MESA_SOURCE_PREFIX}/src/mesa/drivers/dri/intel/
+                         ${MESA_SOURCE_PREFIX}/src/mesa/drivers/dri/i915/
                          ${MESA_SOURCE_PREFIX}/src/mesa/drivers/dri/common/)
 SET(MESA_SOURCE_FOUND 1 CACHE STRING "Set to 1 if mesa source code is found, 0 otherwise")
 ELSE(MESA_SOURCE_PREFIX)

diff --git a/src/intel/intel_dri_resource_sharing.c b/src/intel/intel_dri_resource_sharing.c
index b31844e..188c1fa 100644 (file)
--- a/src/intel/intel_dri_resource_sharing.c
+++ b/src/intel/intel_dri_resource_sharing.c
@@ -119,12 +119,12 @@ intel_get_gl_obj_from_texture(void *driver,
 }
 
 static GLenum
-get_cl_gl_format(gl_format format)
+get_cl_gl_format(mesa_format format)
 {
    switch (format) {
-   case MESA_FORMAT_RGBA8888:
+   case MESA_FORMAT_R8G8B8A8_UNORM:
       return GL_RGBA;
-   case MESA_FORMAT_ARGB8888:
+   case MESA_FORMAT_A8R8G8B8_UNORM:
       return GL_BGRA;
    default:
       return GL_BGRA;