OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

applied David's patch for parsing display's server:screen string

Browse Source
This commit is contained in:
Brian Paul
2001-04-02 22:45:07 +00:00
parent 67f7554232
commit 373aea11c8
1 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
progs/xdemos/glxinfo.c
View File

@@ -1,4 +1,4 @@
/* $Id: glxinfo.c,v 1.12 2001/03/23 21:41:44 brianp Exp $ */ /* $Id: glxinfo.c,v 1.13 2001/04/02 22:45:07 brianp Exp $ */
/* /*
* Copyright (C) 1999-2001 Brian Paul All Rights Reserved. * Copyright (C) 1999-2001 Brian Paul All Rights Reserved.
@@ -44,6 +44,7 @@
#include <GL/glx.h> #include <GL/glx.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <stdlib.h>
#ifndef GLX_NONE_EXT #ifndef GLX_NONE_EXT
@@ -139,6 +140,13 @@ print_extension_list(const char *ext)
} }
static void
print_display_info(Display *dpy)
{
printf("name of display: %s\n", DisplayString(dpy));
}
static void static void
print_screen_info(Display *dpy, int scrnum) print_screen_info(Display *dpy, int scrnum)
{ {
@@ -203,11 +211,26 @@ print_screen_info(Display *dpy, int scrnum)
const char *glRenderer = (const char *) glGetString(GL_RENDERER); const char *glRenderer = (const char *) glGetString(GL_RENDERER);
const char *glVersion = (const char *) glGetString(GL_VERSION); const char *glVersion = (const char *) glGetString(GL_VERSION);
const char *glExtensions = (const char *) glGetString(GL_EXTENSIONS); const char *glExtensions = (const char *) glGetString(GL_EXTENSIONS);
char *displayName = NULL;
char *colon = NULL, *period = NULL;
#ifdef DO_GLU #ifdef DO_GLU
const char *gluVersion = (const char *) gluGetString(GLU_VERSION); const char *gluVersion = (const char *) gluGetString(GLU_VERSION);
const char *gluExtensions = (const char *) gluGetString(GLU_EXTENSIONS); const char *gluExtensions = (const char *) gluGetString(GLU_EXTENSIONS);
#endif #endif
printf("display: %s screen:%d\n", DisplayString(dpy), scrnum); /* Strip the screen number from the display name, if present. */
if (!(displayName = malloc(strlen(DisplayString(dpy)) + 1))) {
fprintf(stderr, "Error: malloc() failed\n");
exit(1);
}
strcpy(displayName, DisplayString(dpy));
colon = strrchr(displayName, ':');
if (colon) {
period = strchr(colon, '.');
if (period)
*period = '\0';
}
printf("display: %s screen: %d\n", displayName, scrnum);
free(displayName);
printf("direct rendering: %s\n", glXIsDirect(dpy, ctx) ? "Yes" : "No"); printf("direct rendering: %s\n", glXIsDirect(dpy, ctx) ? "Yes" : "No");
printf("server glx vendor string: %s\n", serverVendor); printf("server glx vendor string: %s\n", serverVendor);
printf("server glx version string: %s\n", serverVersion); printf("server glx version string: %s\n", serverVersion);
@@ -634,6 +657,7 @@ main(int argc, char *argv[])
} }
else { else {
numScreens = ScreenCount(dpy); numScreens = ScreenCount(dpy);
print_display_info(dpy);
for (scrnum = 0; scrnum < numScreens; scrnum++) { for (scrnum = 0; scrnum < numScreens; scrnum++) {
mesa_hack(dpy, scrnum); mesa_hack(dpy, scrnum);
print_screen_info(dpy, scrnum); print_screen_info(dpy, scrnum);