summaryrefslogtreecommitdiff
path: root/src/glx
diff options
context:
space:
mode:
authorJon Smirl <jonsmirl@gmail.com>2003-10-21 06:05:39 +0000
committerJon Smirl <jonsmirl@gmail.com>2003-10-21 06:05:39 +0000
commitbcc6eddd335e97d49ed2ef3a1440f94d58dce12d (patch)
treeff4883dd4da6ce65500940aebe2c268716311fe6 /src/glx
parent906449753f126f74ad3321d0af897f6609880c17 (diff)
Update DRI drivers to current DRI CVS and make them work.
Diffstat (limited to 'src/glx')
-rw-r--r--src/glx/mini/dri_util.h6
-rw-r--r--src/glx/mini/miniglx.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/src/glx/mini/dri_util.h b/src/glx/mini/dri_util.h
index b653b3c4316..7c0a640e555 100644
--- a/src/glx/mini/dri_util.h
+++ b/src/glx/mini/dri_util.h
@@ -488,6 +488,12 @@ struct __DRIscreenPrivateRec {
* the drawable that was bound. Otherwise, this is NULL.
*/
__DRIdrawablePrivate *fullscreen;
+
+
+ /**
+ * \brief Screen number for when multiple screens are supported
+ */
+ int myNum;
};
extern void
diff --git a/src/glx/mini/miniglx.c b/src/glx/mini/miniglx.c
index 25c7b963624..15563df3f3e 100644
--- a/src/glx/mini/miniglx.c
+++ b/src/glx/mini/miniglx.c
@@ -31,7 +31,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-/* $Id: miniglx.c,v 1.1 2003/08/22 20:11:43 brianp Exp $ */
+/* $Id: miniglx.c,v 1.2 2003/10/21 06:05:40 jonsmirl Exp $ */
/**
* \mainpage Mini GLX
@@ -732,7 +732,7 @@ static int get_chipset_from_busid( Display *dpy )
nr = sscanf(buf, "%04x\t%04x%04x", &encode,
&vendor, &device);
- bus = encode >> 16;
+ bus = encode >> 8;
dev = (encode & 0xFF) >> 3;
fn = encode & 0x7;