diff options
| author | marha <marha@users.sourceforge.net> | 2014-03-04 12:18:13 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-03-04 12:23:48 +0100 |
| commit | 45392e4a0642880b569ea5d4a350cdc395a2c7db (patch) | |
| tree | c3c2a49de903a18c3f8e1bf79684c29337ebcf7c /mesalib/docs/specs | |
| parent | 5ec0616d4e3c4c6095f4975abbe9c21e5b6af967 (diff) | |
| parent | 321c01267ae1c446f1bd22b642567fcafa016c02 (diff) | |
| download | vcxsrv-45392e4a0642880b569ea5d4a350cdc395a2c7db.tar.gz vcxsrv-45392e4a0642880b569ea5d4a350cdc395a2c7db.tar.bz2 vcxsrv-45392e4a0642880b569ea5d4a350cdc395a2c7db.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libX11 libxcb mesa xserver xcb-proto xkeyboard-config git update 4 Mar 2014
Conflicts:
mesalib/src/mapi/glapi/glapi.h
mesalib/src/mapi/glapi/glthread.c
mesalib/src/mesa/drivers/dri/common/dri_util.c
mesalib/src/mesa/main/bufferobj.c
xorg-server/dix/dispatch.c
xorg-server/hw/xwin/glx/gen_gl_wrappers.py
xorg-server/hw/xwin/winmultiwindowwm.c
Diffstat (limited to 'mesalib/docs/specs')
| -rw-r--r-- | mesalib/docs/specs/MESA_query_renderer.spec | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/mesalib/docs/specs/MESA_query_renderer.spec b/mesalib/docs/specs/MESA_query_renderer.spec index bf0975669..dd45e02ba 100644 --- a/mesalib/docs/specs/MESA_query_renderer.spec +++ b/mesalib/docs/specs/MESA_query_renderer.spec @@ -16,11 +16,11 @@ IP Status Status - Incomplete. DO NOT SHIP. + Shipping as of Mesa 10.0 Version - Version 6, 7-November-2013 + Version 8, 14-February-2014 Number @@ -211,7 +211,7 @@ Additions to the GLX 1.4 Specification The attribute name GLX_RENDERER_ID_MESA specified the index of the render against which the context should be created. The default value of - GLX_RENDER_ID_MESA is 0. + GLX_RENDERER_ID_MESA is 0. [Add to list of errors for glXCreateContextAttribsARB in section section @@ -373,7 +373,7 @@ Issues should make every attempt to return as much information as is possible. For example, if the implementation is running on a non-PCI SoC with a Qualcomm GPU, GLX_RENDERER_VENDOR_ID_MESA should return - 0x168C, but GLX_RENDERER_DEVICE_ID_MESA will return 0x0000. + 0x5143, but GLX_RENDERER_DEVICE_ID_MESA will return 0xFFFFFFFF. Revision History @@ -403,3 +403,8 @@ Revision History Version 7, 2013/11/07 - Fix a couple more typos. Add issue #17 regarding the PCI queries on systems that don't have PCI. + + Version 8, 2014/02/14 - Fix a couple typos. GLX_RENDER_ID_MESA should + read GLX_RENDERER_ID_MESA. The VENDOR/DEVICE_ID + example given in issue #17 should be 0x5143 and + 0xFFFFFFFF respectively. |