update 3104 build

support for running Weston 0.95

Signed-Off-By Quanxian Wang <quanxian.wang@intel.com>

diff --git a/packaging/emgd-bin.spec b/packaging/emgd-bin.spec
index b4b19b3..39ba939 100644 (file)
--- a/packaging/emgd-bin.spec
+++ b/packaging/emgd-bin.spec
@@ -23,13 +23,14 @@
 
 Name: emgd-bin
 Summary: Intel EMGD graphics driver
-Version: 2667
+Version: 3104
 Release: 1.8%{?dist}
 License: Intel Proprietary
 Group: System/Libraries
 ExclusiveArch: %{ix86}
 URL: http://edc.intel.com/Software/Downloads/EMGD/
 BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Requires:  libva
 
 Source0: %{name}-%{version}.tar.bz2
 Source1: emgd-bin.init
@@ -116,7 +117,6 @@ install -m 755 libwayland-egl.so.%{libversion} $RPM_BUILD_ROOT%{_libdir}/
 install -m 755 libwayland-emgd.so.%{libversion} $RPM_BUILD_ROOT%{_libdir}/
 install -m 755 libemgdPVR2D_WAYLANDWSEGL.so.%{libversion} $RPM_BUILD_ROOT%{_libdir}/
 install -m 755 libemgdPVR2D_GBMWSEGL.so.%{libversion} $RPM_BUILD_ROOT%{_libdir}/
-install -m 755 libva.so.%{libversion} $RPM_BUILD_ROOT%{_libdir}/
 #
 # Development pkgconfig - GLES2, EGL, gbm
 #
@@ -203,9 +203,6 @@ ln -s -f libwayland-emgd.so.%{libversion} libwayland-emgd.so.1
 ln -s -f libwayland-emgd.so.%{libversion} libwayland-emgd.so
 ln -s -f libEMGDScopeServices.so.%{libversion} libPVRScopeServices.so
 ln -s -f libemgdPVR2D_GBMWSEGL.so.%{libversion} libemgdPVR2D_GBMWSEGL.so
-ln -s -f libva.so.%{libversion} libva.so.1.0.12
-ln -s -f libva.so.%{libversion} libva.so.1
-ln -s -f libva.so.%{libversion} libva.so
 popd
 
 

diff --git a/usr/include/GLES/glext.h b/usr/include/GLES/glext.h
index ccc02e1..991a8ec 100644 (file)
--- a/usr/include/GLES/glext.h
+++ b/usr/include/GLES/glext.h
@@ -275,6 +275,14 @@ typedef void* GLeglImageOES;
 #define GL_TEXTURE_LOD_BIAS_EXT                                 0x8501
 #endif
 
+/* GL_EXT_multisampled_render_to_texture */
+#ifndef GL_EXT_multisampled_render_to_texture
+#define GL_RENDERBUFFER_SAMPLES_EXT                             0x8CAB
+#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT               0x8D56
+#define GL_MAX_SAMPLES_EXT                                      0x8D57
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_SAMPLES_EXT           0x8D6C
+#endif
+
 /*------------------------------------------------------------------------*
  * IMG extension tokens
  *------------------------------------------------------------------------*/
@@ -833,6 +841,17 @@ typedef void (GL_APIENTRYP PFNGLMULTIDRAWELEMENTSEXTPROC) (GLenum mode, const GL
 #define GL_EXT_texture_lod_bias 1
 #endif
 
+/* GL_EXT_multisampled_render_to_texture */
+#ifndef GL_EXT_multisampled_render_to_texture
+#define GL_EXT_multisampled_render_to_texture 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_API void GL_APIENTRY glRenderbufferStorageMultisampleEXT (GLenum, GLsizei, GLenum, GLsizei, GLsizei);
+GL_API void GL_APIENTRY glFramebufferTexture2DMultisampleEXT (GLenum, GLenum, GLenum, GLuint, GLint, GLsizei);
+#endif
+typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DMULTISAMPLEEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLsizei samples);
+#endif
+
 /*------------------------------------------------------------------------*
  * IMG extension functions
  *------------------------------------------------------------------------*/

diff --git a/usr/include/GLES2/gl2ext.h b/usr/include/GLES2/gl2ext.h
index d682633..1fb20d1 100644 (file)
--- a/usr/include/GLES2/gl2ext.h
+++ b/usr/include/GLES2/gl2ext.h
@@ -216,6 +216,14 @@ typedef void* GLeglImageOES;
 #define GL_UNSIGNED_INT_2_10_10_10_REV_EXT                      0x8368
 #endif
 
+/* GL_EXT_multisampled_render_to_texture */
+#ifndef GL_EXT_multisampled_render_to_texture
+#define GL_RENDERBUFFER_SAMPLES_EXT                             0x8CAB
+#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT               0x8D56
+#define GL_MAX_SAMPLES_EXT                                      0x8D57
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_SAMPLES_EXT           0x8D6C
+#endif
+
 /*------------------------------------------------------------------------*
  * IMG extension tokens
  *------------------------------------------------------------------------*/
@@ -579,6 +587,17 @@ typedef void (GL_APIENTRYP PFNGLMULTIDRAWELEMENTSEXTPROC) (GLenum mode, const GL
 #define GL_EXT_texture_type_2_10_10_10_REV 1
 #endif
 
+/* GL_EXT_multisampled_render_to_texture */
+#ifndef GL_EXT_multisampled_render_to_texture
+#define GL_EXT_multisampled_render_to_texture 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glRenderbufferStorageMultisampleEXT (GLenum, GLsizei, GLenum, GLsizei, GLsizei);
+GL_APICALL void GL_APIENTRY glFramebufferTexture2DMultisampleEXT (GLenum, GLenum, GLenum, GLuint, GLint, GLsizei);
+#endif
+typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DMULTISAMPLEEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLsizei samples);
+#endif
+
 /*------------------------------------------------------------------------*
  * IMG extension functions
  *------------------------------------------------------------------------*/

diff --git a/usr/include/gbm.h b/usr/include/gbm.h
index 62d08ae..18989b9 100644 (file)
--- a/usr/include/gbm.h
+++ b/usr/include/gbm.h
@@ -46,8 +46,8 @@ union gbm_bo_handle {
 };
 
 enum gbm_bo_format {
-   GBM_BO_FORMAT_XRGB8888,
-   GBM_BO_FORMAT_ARGB8888,
+   GBM_BO_FORMAT_XRGB8888, 
+   GBM_BO_FORMAT_ARGB8888
 };
 
 #define __gbm_fourcc_code(a,b,c,d) ((uint32_t)(a) | ((uint32_t)(b) << 8) | \
@@ -150,11 +150,12 @@ enum gbm_bo_format {
 #define GBM_FORMAT_YVU422      __gbm_fourcc_code('Y', 'V', '1', '6') /* 2x1 subsampled Cr (1) and Cb (2) planes */
 #define GBM_FORMAT_YUV444      __gbm_fourcc_code('Y', 'U', '2', '4') /* non-subsampled Cb (1) and Cr (2) planes */
 #define GBM_FORMAT_YVU444      __gbm_fourcc_code('Y', 'V', '2', '4') /* non-subsampled Cr (1) and Cb (2) planes */
+
 enum gbm_bo_flags {
    GBM_BO_USE_SCANOUT      = (1 << 0),
    GBM_BO_USE_CURSOR_64X64 = (1 << 1),
    GBM_BO_USE_RENDERING    = (1 << 2),
-   GBM_BO_USE_WRITE        = (1 << 3),
+   GBM_BO_USE_WRITE               = (1 << 3),
 };
 
 int
@@ -178,12 +179,18 @@ gbm_bo_create(struct gbm_device *gbm,
               uint32_t width, uint32_t height,
               uint32_t format, uint32_t flags);
 
+#define GBM_BO_IMPORT_WL_BUFFER         0x5501
+#define GBM_BO_IMPORT_EGL_IMAGE         0x5502
+
+struct gbm_bo *
+gbm_bo_import(struct gbm_device *gbm, uint32_t type,
+              void *buffer, uint32_t usage);
+
 struct gbm_bo *
 gbm_bo_create_from_egl_image(struct gbm_device *gbm,
                              void *egl_dpy, void *egl_img,
                              uint32_t width, uint32_t height,
                              uint32_t usage);
-
 uint32_t
 gbm_bo_get_width(struct gbm_bo *bo);
 
@@ -192,6 +199,10 @@ gbm_bo_get_height(struct gbm_bo *bo);
 
 uint32_t
 gbm_bo_get_pitch(struct gbm_bo *bo);
+
+uint32_t
+gbm_bo_get_stride(struct gbm_bo *bo);
+
 uint32_t
 gbm_bo_get_format(struct gbm_bo *bo);
 
@@ -200,8 +211,10 @@ gbm_bo_get_device(struct gbm_bo *bo);
 
 union gbm_bo_handle
 gbm_bo_get_handle(struct gbm_bo *bo);
+
 int
 gbm_bo_write(struct gbm_bo *bo, const void *buf, size_t count);
+
 void
 gbm_bo_set_user_data(struct gbm_bo *bo, void *data,
                     void (*destroy_user_data)(struct gbm_bo *, void *));
@@ -211,6 +224,7 @@ gbm_bo_get_user_data(struct gbm_bo *bo);
 
 void
 gbm_bo_destroy(struct gbm_bo *bo);
+
 struct gbm_surface *
 gbm_surface_create(struct gbm_device *gbm,
                    uint32_t width, uint32_t height,

diff --git a/usr/lib/dri/emgd_dri.so b/usr/lib/dri/emgd_dri.so
index 94ac0dc..4d08d18 100644 (file)
Binary files a/usr/lib/dri/emgd_dri.so and b/usr/lib/dri/emgd_dri.so differ

diff --git a/usr/lib/dri/emgd_drv_video.so b/usr/lib/dri/emgd_drv_video.so
index bb15750..957986d 100644 (file)
Binary files a/usr/lib/dri/emgd_drv_video.so and b/usr/lib/dri/emgd_drv_video.so differ

diff --git a/usr/lib/libEGL.so.1.5.15.3226 b/usr/lib/libEGL.so.1.5.15.3226
index 0be2371..a08099c 100644 (file)
Binary files a/usr/lib/libEGL.so.1.5.15.3226 and b/usr/lib/libEGL.so.1.5.15.3226 differ

diff --git a/usr/lib/libEMGD2d.so.1.5.15.3226 b/usr/lib/libEMGD2d.so.1.5.15.3226
index 2e6b42f..b65d655 100644 (file)
Binary files a/usr/lib/libEMGD2d.so.1.5.15.3226 and b/usr/lib/libEMGD2d.so.1.5.15.3226 differ

diff --git a/usr/lib/libEMGDOGL.so.1.5.15.3226 b/usr/lib/libEMGDOGL.so.1.5.15.3226
index e821de4..75dfc92 100644 (file)
Binary files a/usr/lib/libEMGDOGL.so.1.5.15.3226 and b/usr/lib/libEMGDOGL.so.1.5.15.3226 differ

diff --git a/usr/lib/libEMGDScopeServices.so.1.5.15.3226 b/usr/lib/libEMGDScopeServices.so.1.5.15.3226
index 8aa18d9..c5fadd8 100644 (file)
Binary files a/usr/lib/libEMGDScopeServices.so.1.5.15.3226 and b/usr/lib/libEMGDScopeServices.so.1.5.15.3226 differ

diff --git a/usr/lib/libEMGDegl.so.1.5.15.3226 b/usr/lib/libEMGDegl.so.1.5.15.3226
index a60f4e2..deee7b0 100644 (file)
Binary files a/usr/lib/libEMGDegl.so.1.5.15.3226 and b/usr/lib/libEMGDegl.so.1.5.15.3226 differ

diff --git a/usr/lib/libGLES_CM.so.1.5.15.3226 b/usr/lib/libGLES_CM.so.1.5.15.3226
index d9fafe8..8c39414 100644 (file)
Binary files a/usr/lib/libGLES_CM.so.1.5.15.3226 and b/usr/lib/libGLES_CM.so.1.5.15.3226 differ

diff --git a/usr/lib/libGLESv2.so.1.5.15.3226 b/usr/lib/libGLESv2.so.1.5.15.3226
index f10fa38..f42fb68 100644 (file)
Binary files a/usr/lib/libGLESv2.so.1.5.15.3226 and b/usr/lib/libGLESv2.so.1.5.15.3226 differ

diff --git a/usr/lib/libOpenVG.so.1.5.15.3226 b/usr/lib/libOpenVG.so.1.5.15.3226
index efa194d..3e87249 100644 (file)
Binary files a/usr/lib/libOpenVG.so.1.5.15.3226 and b/usr/lib/libOpenVG.so.1.5.15.3226 differ

diff --git a/usr/lib/libOpenVGU.so.1.5.15.3226 b/usr/lib/libOpenVGU.so.1.5.15.3226
index 55c51bf..1976d3b 100644 (file)
Binary files a/usr/lib/libOpenVGU.so.1.5.15.3226 and b/usr/lib/libOpenVGU.so.1.5.15.3226 differ

diff --git a/usr/lib/libemgdPVR2D_DRIWSEGL.so.1.5.15.3226 b/usr/lib/libemgdPVR2D_DRIWSEGL.so.1.5.15.3226
index 7b28334..4aacf59 100644 (file)
Binary files a/usr/lib/libemgdPVR2D_DRIWSEGL.so.1.5.15.3226 and b/usr/lib/libemgdPVR2D_DRIWSEGL.so.1.5.15.3226 differ

diff --git a/usr/lib/libemgdPVR2D_GBMWSEGL.so.1.5.15.3226 b/usr/lib/libemgdPVR2D_GBMWSEGL.so.1.5.15.3226
index 34432a2..49b3dde 100644 (file)
Binary files a/usr/lib/libemgdPVR2D_GBMWSEGL.so.1.5.15.3226 and b/usr/lib/libemgdPVR2D_GBMWSEGL.so.1.5.15.3226 differ

diff --git a/usr/lib/libemgdPVR2D_WAYLANDWSEGL.so.1.5.15.3226 b/usr/lib/libemgdPVR2D_WAYLANDWSEGL.so.1.5.15.3226
index 2ac9477..27ec61d 100644 (file)
Binary files a/usr/lib/libemgdPVR2D_WAYLANDWSEGL.so.1.5.15.3226 and b/usr/lib/libemgdPVR2D_WAYLANDWSEGL.so.1.5.15.3226 differ

diff --git a/usr/lib/libemgdglslcompiler.so.1.5.15.3226 b/usr/lib/libemgdglslcompiler.so.1.5.15.3226
index bdd4ede..506b4b8 100644 (file)
Binary files a/usr/lib/libemgdglslcompiler.so.1.5.15.3226 and b/usr/lib/libemgdglslcompiler.so.1.5.15.3226 differ

diff --git a/usr/lib/libemgdsrv_init.so.1.5.15.3226 b/usr/lib/libemgdsrv_init.so.1.5.15.3226
index 4017b13..c20490f 100644 (file)
Binary files a/usr/lib/libemgdsrv_init.so.1.5.15.3226 and b/usr/lib/libemgdsrv_init.so.1.5.15.3226 differ

diff --git a/usr/lib/libemgdsrv_um.so.1.5.15.3226 b/usr/lib/libemgdsrv_um.so.1.5.15.3226
index 41d5ef1..fbf68e5 100644 (file)
Binary files a/usr/lib/libemgdsrv_um.so.1.5.15.3226 and b/usr/lib/libemgdsrv_um.so.1.5.15.3226 differ

diff --git a/usr/lib/libgbm.so.1.5.15.3226 b/usr/lib/libgbm.so.1.5.15.3226
index edd7f35..2e3d85d 100644 (file)
Binary files a/usr/lib/libgbm.so.1.5.15.3226 and b/usr/lib/libgbm.so.1.5.15.3226 differ

diff --git a/usr/lib/libva-egl.so.1.5.15.3226 b/usr/lib/libva-egl.so.1.5.15.3226
deleted file mode 100755 (executable)
index 3a2c20e..0000000
Binary files a/usr/lib/libva-egl.so.1.5.15.3226 and /dev/null differ

diff --git a/usr/lib/libva-glx.so.1.5.15.3226 b/usr/lib/libva-glx.so.1.5.15.3226
deleted file mode 100755 (executable)
index 301defa..0000000
Binary files a/usr/lib/libva-glx.so.1.5.15.3226 and /dev/null differ

diff --git a/usr/lib/libva-tpi.so.1.5.15.3226 b/usr/lib/libva-tpi.so.1.5.15.3226
deleted file mode 100755 (executable)
index 5e9fdf3..0000000
Binary files a/usr/lib/libva-tpi.so.1.5.15.3226 and /dev/null differ

diff --git a/usr/lib/libva-x11.so.1.5.15.3226 b/usr/lib/libva-x11.so.1.5.15.3226
deleted file mode 100755 (executable)
index 9715274..0000000
Binary files a/usr/lib/libva-x11.so.1.5.15.3226 and /dev/null differ

diff --git a/usr/lib/libva.so.1.5.15.3226 b/usr/lib/libva.so.1.5.15.3226
deleted file mode 100755 (executable)
index dfadfd7..0000000
Binary files a/usr/lib/libva.so.1.5.15.3226 and /dev/null differ

diff --git a/usr/lib/libwayland-emgd.so.1.5.15.3226 b/usr/lib/libwayland-emgd.so.1.5.15.3226
old mode 100755 (executable)
new mode 100644 (file)
index 7c04085..621ab8d
Binary files a/usr/lib/libwayland-emgd.so.1.5.15.3226 and b/usr/lib/libwayland-emgd.so.1.5.15.3226 differ

diff --git a/usr/lib/pkgconfig/egl.pc b/usr/lib/pkgconfig/egl.pc
index 64e45ca..9390584 100644 (file)
--- a/usr/lib/pkgconfig/egl.pc
+++ b/usr/lib/pkgconfig/egl.pc
@@ -6,7 +6,7 @@ includedir=/usr/include
 Name: egl
 Description: Mesa EGL library
 Requires.private: glproto >= 1.4.14 libdrm >= 2.4.24 dri2proto >= 2.6 x11 xext xdamage xfixes x11-xcb xcb-glx xxf86vm
-Version: 8.0.0
+Version: 8.1.0
 Libs: -L${libdir} -lEGL
 Libs.private: -lm -lpthread -ldl
 Cflags: -I${includedir} 

diff --git a/usr/lib/pkgconfig/glesv1_cm.pc b/usr/lib/pkgconfig/glesv1_cm.pc
index 97c2e7f..94950e0 100644 (file)
--- a/usr/lib/pkgconfig/glesv1_cm.pc
+++ b/usr/lib/pkgconfig/glesv1_cm.pc
@@ -6,7 +6,7 @@ includedir=/usr/include
 Name: glesv1_cm
 Description: PowerVR OpenGL ES 1.1 CM library
 Requires.private: 
-Version: 8.0.0
+Version: 8.1.0
 Libs: -L${libdir} -lGLESv1_CM
 Libs.private: -lm -lpthread -ldl
 Cflags: -I${includedir} 

diff --git a/usr/lib/pkgconfig/glesv2.pc b/usr/lib/pkgconfig/glesv2.pc
index e5290c9..03f2b28 100644 (file)
--- a/usr/lib/pkgconfig/glesv2.pc
+++ b/usr/lib/pkgconfig/glesv2.pc
@@ -6,7 +6,7 @@ includedir=/usr/include
 Name: glesv2
 Description: Mesa OpenGL ES 2.0 library
 Requires.private: 
-Version: 8.0.0
+Version: 8.1.0
 Libs: -L${libdir} -lGLESv2
 Libs.private: -lm -lpthread -ldl
 Cflags: -I${includedir} 

diff --git a/usr/lib/pkgconfig/vg.pc b/usr/lib/pkgconfig/vg.pc
index 29704e2..c8afe32 100644 (file)
--- a/usr/lib/pkgconfig/vg.pc
+++ b/usr/lib/pkgconfig/vg.pc
@@ -6,7 +6,7 @@ includedir=/usr/include
 Name: vg
 Description: PowerVR OpenVG 1.0 library
 Requires.private: 
-Version: 8.0.0
+Version: 8.1.0
 Libs: -L${libdir} -lOpenVG
 Libs.private: 
 Cflags: -I${includedir} 

diff --git a/usr/lib/pkgconfig/wayland-egl.pc b/usr/lib/pkgconfig/wayland-egl.pc
index 77d7cb5..8fe83be 100644 (file)
--- a/usr/lib/pkgconfig/wayland-egl.pc
+++ b/usr/lib/pkgconfig/wayland-egl.pc
@@ -6,7 +6,7 @@ includedir=/usr/include
 Name: wayland-egl
 Description: Mesa wayland-egl library
 Requires.private: wayland-client libdrm
-Version: 8.0.0
+Version: 8.1.0
 Libs: -L${libdir} -lwayland-egl
 Libs.private: 
 Cflags: -I${includedir} 

diff --git a/usr/lib/xorg/modules/drivers/emgd_drv.so b/usr/lib/xorg/modules/drivers/emgd_drv.so
index 14c785b..037659a 100644 (file)
Binary files a/usr/lib/xorg/modules/drivers/emgd_drv.so and b/usr/lib/xorg/modules/drivers/emgd_drv.so differ