diff options
| author | Jason Ekstrand <[email protected]> | 2016-03-15 14:09:50 -0700 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2016-03-15 14:09:50 -0700 |
| commit | 7f6a0cb29c89a03441be744680a2145445be3a3c (patch) | |
| tree | 516824ab49962521563b95fa79430cf948baaccc /include | |
| parent | b83785d86d2c7f07323920615c72a9f09695a9a7 (diff) | |
| parent | e103b52aec773537d2821d8acc42ac9caa2a4b17 (diff) | |
Merge remote-tracking branch 'public/master' into vulkan
Diffstat (limited to 'include')
| -rw-r--r-- | include/EGL/eglmesaext.h | 11 | ||||
| -rw-r--r-- | include/GL/internal/dri_interface.h | 5 | ||||
| -rw-r--r-- | include/pci_ids/i965_pci_ids.h | 4 |
3 files changed, 7 insertions, 13 deletions
diff --git a/include/EGL/eglmesaext.h b/include/EGL/eglmesaext.h index 917a2043c77..337dd2cb789 100644 --- a/include/EGL/eglmesaext.h +++ b/include/EGL/eglmesaext.h @@ -34,17 +34,6 @@ extern "C" { #include <EGL/eglplatform.h> -#ifndef EGL_MESA_drm_display -#define EGL_MESA_drm_display 1 - -#ifdef EGL_EGLEXT_PROTOTYPES -EGLAPI EGLDisplay EGLAPIENTRY eglGetDRMDisplayMESA(int fd); -#endif /* EGL_EGLEXT_PROTOTYPES */ - -typedef EGLDisplay (EGLAPIENTRYP PFNEGLGETDRMDISPLAYMESA) (int fd); - -#endif /* EGL_MESA_drm_display */ - #ifdef EGL_MESA_drm_image /* Mesa's extension to EGL_MESA_drm_image... */ #ifndef EGL_DRM_BUFFER_USE_CURSOR_MESA diff --git a/include/GL/internal/dri_interface.h b/include/GL/internal/dri_interface.h index 6bbd3fa87f5..2b49a2941e1 100644 --- a/include/GL/internal/dri_interface.h +++ b/include/GL/internal/dri_interface.h @@ -1100,6 +1100,11 @@ struct __DRIdri2ExtensionRec { #define __DRI_IMAGE_USE_SCANOUT 0x0002 #define __DRI_IMAGE_USE_CURSOR 0x0004 /* Depricated */ #define __DRI_IMAGE_USE_LINEAR 0x0008 +/* The buffer will only be read by an external process after SwapBuffers, + * in contrary to gbm buffers, front buffers and fake front buffers, which + * could be read after a flush." + */ +#define __DRI_IMAGE_USE_BACKBUFFER 0x0010 /** diff --git a/include/pci_ids/i965_pci_ids.h b/include/pci_ids/i965_pci_ids.h index bdfbefe0b75..bd645fae640 100644 --- a/include/pci_ids/i965_pci_ids.h +++ b/include/pci_ids/i965_pci_ids.h @@ -156,8 +156,8 @@ CHIPSET(0x5932, kbl_gt4, "Intel(R) Kabylake GT4") CHIPSET(0x593A, kbl_gt4, "Intel(R) Kabylake GT4") CHIPSET(0x593B, kbl_gt4, "Intel(R) Kabylake GT4") CHIPSET(0x593D, kbl_gt4, "Intel(R) Kabylake GT4") -CHIPSET(0x22B0, chv, "Intel(R) HD Graphics (Cherryview)") -CHIPSET(0x22B1, chv, "Intel(R) HD Graphics (Cherryview)") +CHIPSET(0x22B0, chv, "Intel(R) HD Graphics (Cherrytrail)") +CHIPSET(0x22B1, chv, "Intel(R) HD Graphics XXX (Braswell)") /* Overridden in brw_get_renderer_string */ CHIPSET(0x22B2, chv, "Intel(R) HD Graphics (Cherryview)") CHIPSET(0x22B3, chv, "Intel(R) HD Graphics (Cherryview)") CHIPSET(0x0A84, bxt, "Intel(R) HD Graphics (Broxton)") |